diff --git a/inc/app/cms/boxes/delete/index.php b/inc/app/cms/boxes/delete/index.php index fad34d9e..0b918093 100644 --- a/inc/app/cms/boxes/delete/index.php +++ b/inc/app/cms/boxes/delete/index.php @@ -100,7 +100,10 @@ } } // index page cannot be deleted - if ((count ($failed) > 0) || (in_array('index',$id))) { + if ((count ($failed) > 0) || + (is_array ($id) && in_array ('index', $id)) || + (! is_array ($id) && 'index' === $id)) + { page_title (intl_get ('An Error Occurred')); echo '

' . $rex->error . '

'; echo '

' . intl_get ('The following items were not deleted') . ':

'; @@ -124,7 +127,7 @@ session_set ('sitellite_alert', intl_get ('The items have been deleted.')); -if (! empty ($parameters['_return']) && $parameters['_return'] != site_prefix () . '/index/' . $parameters['_key'][0] && ! strpos ($parameters['_return'], $parameters['_key'][0])) { +if (! empty ($parameters['_return']) && $parameters['_return'] != site_prefix () . '/index/' . $parameters['_key'][0] && ! ('' !== $parameters['_key'][0] && strpos ($parameters['_return'], $parameters['_key'][0]))) { header ('Location: ' . $parameters['_return']); exit; } diff --git a/inc/app/cms/forms/add/sitellite_filesystem/index.php b/inc/app/cms/forms/add/sitellite_filesystem/index.php index 1acaf105..94a8a67d 100644 --- a/inc/app/cms/forms/add/sitellite_filesystem/index.php +++ b/inc/app/cms/forms/add/sitellite_filesystem/index.php @@ -116,7 +116,7 @@ function cms_cancel_action (f) { $this->widgets['submit_button']->buttons[2]->extra = 'onclick="return cms_cancel (this.form)"'; } - function show () { + function show ($template = '') { return loader_box ('cms/user/preferences/level') . parent::show (); } diff --git a/inc/app/cms/forms/edit/sitellite_filesystem/index.php b/inc/app/cms/forms/edit/sitellite_filesystem/index.php index 3b4ab991..1af6aff0 100644 --- a/inc/app/cms/forms/edit/sitellite_filesystem/index.php +++ b/inc/app/cms/forms/edit/sitellite_filesystem/index.php @@ -180,7 +180,7 @@ function cms_cancel_action (f) { }*/ } - function show () { + function show ($template = '') { return loader_box ('cms/user/preferences/level') . parent::show (); } diff --git a/inc/app/multilingual/boxes/index/index.php b/inc/app/multilingual/boxes/index/index.php index 7daf5b3f..6ec518c3 100644 --- a/inc/app/multilingual/boxes/index/index.php +++ b/inc/app/multilingual/boxes/index/index.php @@ -104,8 +104,14 @@ foreach ($list as $item) { $parameters['list'][$item->{$r->key}] = $tr->get ($item->{$r->key}); if ($parameters['list'][$item->{$r->key}]->collection) { + if (! is_object ($parameters['list'][$item->{$r->key}])) { + $parameters['list'][$item->{$r->key}] = new stdClass; + } $parameters['list'][$item->{$r->key}]->title = multilingual_filter_title ($parameters['list'][$item->{$r->key}]->collection, $item->{$r->key}); } else { + if (! is_object ($parameters['list'][$item->{$r->key}])) { + $parameters['list'][$item->{$r->key}] = new stdClass; + } $parameters['list'][$item->{$r->key}]->title = multilingual_filter_title ($cgi->_collection, $item->{$r->key}); } } diff --git a/inc/app/sitesearch/boxes/stats/index/index.php b/inc/app/sitesearch/boxes/stats/index/index.php index 3492a7d7..a12b918f 100644 --- a/inc/app/sitesearch/boxes/stats/index/index.php +++ b/inc/app/sitesearch/boxes/stats/index/index.php @@ -42,6 +42,8 @@ // indexing info +$data = new stdClass; + /* $data = $logger->getCurrentIndex (); if (! $data) { diff --git a/inc/app/sitewiki/forms/edit/index.php b/inc/app/sitewiki/forms/edit/index.php index 99eb2fa9..63bfed5c 100644 --- a/inc/app/sitewiki/forms/edit/index.php +++ b/inc/app/sitewiki/forms/edit/index.php @@ -75,7 +75,7 @@ function SitewikiEditForm () { } } - function show () { + function show ($template = '') { if (! $this->editable) { return; } diff --git a/inc/app/xed/boxes/editor/index.php b/inc/app/xed/boxes/editor/index.php index e3b92e6b..2ea5b0b7 100644 --- a/inc/app/xed/boxes/editor/index.php +++ b/inc/app/xed/boxes/editor/index.php @@ -20,7 +20,7 @@ function WysiwygEditorForm () { $b->extra = 'onclick="return xed_window_cancel (this.form)"'; } - function show () { + function show ($template = '') { echo '