Index: branches/5.2.x/core/units/helpers/sections_helper.php
===================================================================
diff -u -N -r13840 -r14095
--- branches/5.2.x/core/units/helpers/sections_helper.php (.../sections_helper.php) (revision 13840)
+++ branches/5.2.x/core/units/helpers/sections_helper.php (.../sections_helper.php) (revision 14095)
@@ -1,6 +1,6 @@
debugMode = $this->Application->isDebugMode();
+ $this->superAdminMode = $this->Application->RecallVar('super_admin');
+ }
+
/**
* Set's prefix and special
*
* @param string $prefix
* @param string $special
* @access public
*/
- function Init($prefix, $special, $event_params = null)
+ public function Init($prefix, $special)
{
- parent::Init($prefix, $special, $event_params);
+ parent::Init($prefix, $special);
- $this->debugMode = $this->Application->isDebugMode();
- $this->superAdminMode = $this->Application->RecallVar('super_admin');
-
$this->BuildTree();
}
@@ -119,7 +124,7 @@
continue;
}
- $this->Tree[$section_name] = array_merge_recursive2($this->Tree[$section_name], $ajustment_params);
+ $this->Tree[$section_name] = kUtil::array_merge_recursive($this->Tree[$section_name], $ajustment_params);
}
else {
// then remove section
@@ -257,7 +262,7 @@
trigger_error('Section "' . $section_name . '" declaration (originally defined in "' . $current_data['SectionPrefix'] . '") was overwriten from "' . $prefix . '"', E_USER_WARNING);
}
- $this->Tree[$section_name] = array_merge_recursive2($current_data, $section_params);
+ $this->Tree[$section_name] = kUtil::array_merge_recursive($current_data, $section_params);
}
}