kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Bugfix affichage rawhtml des variables 

Debut de changement pour variable_get
This commit is contained in:
Alan Garcia 2014-03-20 11:53:32 +00:00
parent 31d2e980c3
commit 19dbf9561f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bureau/class/m_admin.php
View File

@ -587,7 +587,7 @@ class m_admin {
*/ */
function hook_admin_add_member() { function hook_admin_add_member() {
global $err, $cuid, $L_FQDN, $L_HOSTING; global $err, $cuid, $L_FQDN, $L_HOSTING;
$dest = variable_get('new_email', 0, 'An email will be sent to this address when new accounts are created if set.'); $dest = variable_get('new_email', '0', 'An email will be sent to this address when new accounts are created if set.', array(array('desc'=>'Enabled','type'=>'boolean')));
if (!$dest) { if (!$dest) {
return false; return false;
} }

12
bureau/class/m_variables.php
View File

@ -248,11 +248,19 @@ class m_variables {
echo "$k"; echo "$k";
} else { } else {
if ( !isset($this->variables_list()['DEFAULT'][null][$varname]['type'][$k]) || is_array( $this->variables_list()['DEFAULT'][null][$varname]['type'][$k] ) ) { if ( !isset($this->variables_list()['DEFAULT'][null][$varname]['type'][$k]) || is_array( $this->variables_list()['DEFAULT'][null][$varname]['type'][$k] ) ) {
echo $k; if (isset($this->variables_list()['DEFAULT'][null][$varname]['type'][$k]['desc'])) {
echo $this->variables_list()['DEFAULT'][null][$varname]['type'][$k]['desc'];
} else {
echo $k;
}
} else { } else {
echo $this->variables_list()['DEFAULT'][null][$varname]['type'][$k]; echo $this->variables_list()['DEFAULT'][null][$varname]['type'][$k];
} }
} }
} else {
if (isset($this->variables_list()['DEFAULT'][null][$varname]['type'][$k]['desc'] )) {
echo $this->variables_list()['DEFAULT'][null][$varname]['type'][$k]['desc'];
}
} }
if (is_array($l)) { if (is_array($l)) {
echo "<ul>"; echo "<ul>";
@ -274,7 +282,7 @@ class m_variables {
} }
echo "</ul>"; echo "</ul>";
} // empty $v } // empty $v
} else if (empty($v)) { } else if (empty($v) && $v != '0') {
echo "<em>"._("Empty")."</em>"; echo "<em>"._("Empty")."</em>";
} else { } else {
echo $v; echo $v;