diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index 4b79c787c..88ed11b64 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -211,7 +211,7 @@ class page_chapters_ui extends e_admin_ui } - public function beforeCreate($new_data) + public function beforeCreate($new_data, $old_data) { if(empty($new_data['chapter_sef'])) { @@ -725,7 +725,7 @@ class page_admin_ui extends e_admin_ui return $newdata; } - function beforeUpdate($newdata,$olddata) + function beforeUpdate($newdata,$olddata, $id) { if(isset($newdata['menu_name'])) { diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index b13e5076d..f4d7b40c8 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -4855,9 +4855,9 @@ class e_form if(!isset($parms['__options'])) $parms['__options'] = array(); if(!is_array($parms['__options'])) parse_str($parms['__options'], $parms['__options']); - if((empty($value) && !empty($parms['currentInit']) && !isset($parms['default']) ) || !empty($parms['current']) || (vartrue($parms['default']) == 'USERID')) // include current user by default. + if((empty($value) || !empty($parms['currentInit']) && empty($parms['default']) ) || !empty($parms['current']) || (vartrue($parms['default']) == 'USERID')) // include current user by default. { - $value = USERID; + $value = array('user_id'=>USERID, 'user_name'=>USERNAME); if(vartrue($parms['current'])) { $parms['__options']['readonly'] = true; @@ -4865,6 +4865,10 @@ class e_form } + + + + // if(!is_array($value)) // { // $value = $value ? e107::getSystemUser($value, true)->getUserData() : array();// e107::user($value); diff --git a/e107_images/secimg.php b/e107_images/secimg.php index 04d6c857e..d4fa61438 100644 --- a/e107_images/secimg.php +++ b/e107_images/secimg.php @@ -65,7 +65,7 @@ else $color = "cccccc"; } - +ob_clean(); // Precaution - clearout utf-8 BOM or any other garbage in e107_config.php $sim->render($code,$color); exit;