From a1176756a4e9d34a82848c3cd6dd8df6aad7f34e Mon Sep 17 00:00:00 2001 From: real_nowhereman Date: Tue, 21 Jul 2009 15:51:49 +0000 Subject: [PATCH] porting to PHP5-style object assignments --- admin/includes/panels.prototypes.php | 10 +++++----- admin/main.php | 6 +++--- admin/panels/config/admin.config.php | 2 +- admin/panels/entry/admin.entry.list.php | 2 +- admin/panels/maintain/admin.maintain.php | 2 +- admin/panels/plugin/admin.plugin.php | 2 +- admin/panels/themes/admin.themes.php | 2 +- admin/panels/themes/admin.themes.style.php | 4 ++-- admin/panels/widgets/admin.widgets.default.php | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/admin/includes/panels.prototypes.php b/admin/includes/panels.prototypes.php index f17da3d..f6051ff 100644 --- a/admin/includes/panels.prototypes.php +++ b/admin/includes/panels.prototypes.php @@ -23,7 +23,7 @@ function AdminPanel(&$smarty) { - $this->smarty =& $smarty; + $this->smarty = $smarty; if (!$this->panelname) trigger_error("Variable \$panelname is not defined!", E_USER_ERROR); @@ -76,13 +76,13 @@ trigger_error("No classes for action $action.", E_USER_ERROR); } - $obj =& new $class($this->smarty); + $obj = new $class($this->smarty); return $obj; } else trigger_error("No script found for action $action", E_USER_ERROR); } else { - $obj =& new $class($this->smarty); + $obj = new $class($this->smarty); } return $obj; @@ -101,7 +101,7 @@ var $langres = ''; function AdminPanelAction(&$smarty) { - $this->smarty =& $smarty; + $this->smarty = $smarty; $the_action_panel = get_class($this); $this->smarty->assign('admin_panel_id', $the_action_panel); if (!$this->langres) @@ -251,7 +251,7 @@ if (!$lang_loaded) { $lang = lang_load('admin.'.ADMIN_PANEL); - $l =& $lang['admin'][ADMIN_PANEL][ADMIN_PANEL_ACTION]; + $l = $lang['admin'][ADMIN_PANEL][ADMIN_PANEL_ACTION]; } $errors[$field] = $l['error'][$field]; diff --git a/admin/main.php b/admin/main.php index 98b9e2f..492a043 100755 --- a/admin/main.php +++ b/admin/main.php @@ -53,7 +53,7 @@ if (!class_exists($panelclass)) trigger_error("No class defined for requested panel", E_USER_ERROR); - $fp_admin =& new $panelclass($smarty); + $fp_admin = new $panelclass($smarty); } @@ -69,7 +69,7 @@ if (!$fp_admin) return; - $fp_admin_action =& $fp_admin->get_action($action); + $fp_admin_action = $fp_admin->get_action($action); define('ADMIN_PANEL_ACTION', $action); @@ -179,7 +179,7 @@ theme_init($smarty); $smarty->register_function('controlpanel', 'showcontrolpanel'); - $v =& $lang['admin'][$panel][$action]; + $v = $lang['admin'][$panel][$action]; $smarty->assign_by_ref('panelstrings', $v); diff --git a/admin/panels/config/admin.config.php b/admin/panels/config/admin.config.php index 824c508..e6ec721 100755 --- a/admin/panels/config/admin.config.php +++ b/admin/panels/config/admin.config.php @@ -101,7 +101,7 @@ function cleartplcache() { // if theme was switched, clear tpl cache - $tpl =& new tpl_deleter(); + $tpl = new tpl_deleter(); $tpl->getList(); diff --git a/admin/panels/entry/admin.entry.list.php b/admin/panels/entry/admin.entry.list.php index 873b16e..64097ed 100755 --- a/admin/panels/entry/admin.entry.list.php +++ b/admin/panels/entry/admin.entry.list.php @@ -43,7 +43,7 @@ function main() { parent::main(); - //$smarty =& $this->smarty; + //$smarty = $this->smarty; // parameters for the list // start offset and count (now defaults to 8...) diff --git a/admin/panels/maintain/admin.maintain.php b/admin/panels/maintain/admin.maintain.php index 9624347..bff0982 100755 --- a/admin/panels/maintain/admin.maintain.php +++ b/admin/panels/maintain/admin.maintain.php @@ -41,7 +41,7 @@ var $_directory = CONTENT_DIR; function s_entry_crawler() { - $this->index =& entry_init(); + $this->index = entry_init(); parent::fs_filelister(); } diff --git a/admin/panels/plugin/admin.plugin.php b/admin/panels/plugin/admin.plugin.php index 2560be8..b30932d 100644 --- a/admin/panels/plugin/admin.plugin.php +++ b/admin/panels/plugin/admin.plugin.php @@ -40,7 +40,7 @@ SCP; $this->pluginid = isset($_GET['plugin'])? $_GET['plugin'] : null; - $pi =& new plugin_indexer; + $pi = new plugin_indexer; $plist = $pi->getList(); sort($plist); $this->smarty->assign('pluginlist', $plist); diff --git a/admin/panels/themes/admin.themes.php b/admin/panels/themes/admin.themes.php index 7ce6564..6e6e312 100644 --- a/admin/panels/themes/admin.themes.php +++ b/admin/panels/themes/admin.themes.php @@ -150,7 +150,7 @@ function cleartplcache() { // if theme was switched, clear tpl cache - $tpl =& new tpl_deleter(); + $tpl = new tpl_deleter(); $tpl->getList(); diff --git a/admin/panels/themes/admin.themes.style.php b/admin/panels/themes/admin.themes.style.php index 2863e99..443a0d3 100644 --- a/admin/panels/themes/admin.themes.style.php +++ b/admin/panels/themes/admin.themes.style.php @@ -24,7 +24,7 @@ function style_list() { global $fp_config; - $o =& new admin_themes_obj_style_idx; + $o = new admin_themes_obj_style_idx; $list = $o->getList(); sort($list); @@ -88,7 +88,7 @@ function cleartplcache() { // if theme was switched, clear tpl cache - $tpl =& new tpl_deleter(); + $tpl = new tpl_deleter(); $tpl->getList(); diff --git a/admin/panels/widgets/admin.widgets.default.php b/admin/panels/widgets/admin.widgets.default.php index 4ce85cd..d3b60cf 100644 --- a/admin/panels/widgets/admin.widgets.default.php +++ b/admin/panels/widgets/admin.widgets.default.php @@ -28,7 +28,7 @@ if (isset($registered_w[$newid])){ - $thiswdg =& $registered_w[$newid]; + $thiswdg = $registered_w[$newid]; $widget_list[$wpos][$idx]['name'] = $thiswdg['name'];