mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-08 19:21:40 +09:00
Fix unnecessary assignment by reference, which causes E_NOTICE
This commit is contained in:
parent
ed15587c4f
commit
6c113c22ed
35 changed files with 80 additions and 84 deletions
|
|
@ -726,7 +726,7 @@ class LayoutAdminController extends Layout
|
|||
$args->layout_type = $layout->layout_type;
|
||||
if(!$args->layout_type) $args->layout_type = "P";
|
||||
|
||||
$oDB = &DB::getInstance();
|
||||
$oDB = DB::getInstance();
|
||||
$oDB->begin();
|
||||
|
||||
if(is_array($sourceArgs->title))
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ class LayoutAdminModel extends Layout
|
|||
$security->encodeHTML('layout_code_css', 'layout_code', 'widget_list..title');
|
||||
|
||||
$script = '<script src="./modules/layout/tpl/js/layout_admin_set_html.js"></script>';
|
||||
$oTemplate = &TemplateHandler::getInstance();
|
||||
$oTemplate = TemplateHandler::getInstance();
|
||||
$html = $oTemplate->compile($this->module_path.'tpl/', 'layout_html_css_view');
|
||||
|
||||
$this->add('html', $script.$html);
|
||||
|
|
|
|||
|
|
@ -214,7 +214,7 @@ class LayoutAdminView extends Layout
|
|||
|
||||
Context::set('is_sitemap', '0');
|
||||
$script = '<script src="./modules/layout/tpl/js/layout_modify.js"></script>';
|
||||
$oTemplate = &TemplateHandler::getInstance();
|
||||
$oTemplate = TemplateHandler::getInstance();
|
||||
$content = $oTemplate->compile($this->module_path.'tpl/', 'layout_info_view');
|
||||
|
||||
Context::set('content', $content);
|
||||
|
|
@ -336,7 +336,7 @@ class LayoutAdminView extends Layout
|
|||
FileHandler::writeFile($edited_layout_file, $code);
|
||||
|
||||
// Compile
|
||||
$oTemplate = &TemplateHandler::getInstance();
|
||||
$oTemplate = TemplateHandler::getInstance();
|
||||
|
||||
$layout_path = $layout_info->path;
|
||||
$layout_file = 'layout';
|
||||
|
|
@ -344,7 +344,6 @@ class LayoutAdminView extends Layout
|
|||
$layout_tpl = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
|
||||
Context::set('layout','none');
|
||||
// Convert widgets and others
|
||||
$oContext = &Context::getInstance();
|
||||
Context::set('layout_tpl', $layout_tpl);
|
||||
// Delete Temporary Files
|
||||
FileHandler::removeFile($edited_layout_file);
|
||||
|
|
@ -395,7 +394,7 @@ class LayoutAdminView extends Layout
|
|||
Context::addHtmlHeader($script);
|
||||
}
|
||||
|
||||
$oTemplate = &TemplateHandler::getInstance();
|
||||
$oTemplate = TemplateHandler::getInstance();
|
||||
Context::set('content', $oTemplate->compile($this->module_path.'tpl','about_faceoff'));
|
||||
// Change widget codes in Javascript mode
|
||||
$oWidgetController = getController('widget');
|
||||
|
|
|
|||
|
|
@ -1102,7 +1102,7 @@ class LayoutModel extends Layout
|
|||
// Display menu when editing the faceOff page
|
||||
if(Context::get('act')=='dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
|
||||
{
|
||||
$oTemplate = &TemplateHandler::getInstance();
|
||||
$oTemplate = TemplateHandler::getInstance();
|
||||
Context::addBodyHeader($oTemplate->compile($this->module_path.'/tpl', 'faceoff_layout_menu'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -227,7 +227,6 @@ class LayoutView extends Layout
|
|||
Context::set('layout','none');
|
||||
|
||||
// Convert widgets and others
|
||||
$oContext = Context::getInstance();
|
||||
Context::set('layout_tpl', $layout_tpl);
|
||||
$this->setTemplatePath($this->module_path.'tpl');
|
||||
$this->setTemplateFile('layout_preview');
|
||||
|
|
@ -371,7 +370,7 @@ class LayoutView extends Layout
|
|||
FileHandler::writeFile($edited_layout_file, $code);
|
||||
|
||||
// Compile
|
||||
$oTemplate = &TemplateHandler::getInstance();
|
||||
$oTemplate = TemplateHandler::getInstance();
|
||||
|
||||
$layout_path = $layout_info->path;
|
||||
$layout_file = 'layout';
|
||||
|
|
@ -379,7 +378,6 @@ class LayoutView extends Layout
|
|||
$layout_tpl = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
|
||||
Context::set('layout','none');
|
||||
// Convert widgets and others
|
||||
$oContext = &Context::getInstance();
|
||||
Context::set('layout_tpl', $layout_tpl);
|
||||
// Delete Temporary Files
|
||||
FileHandler::removeFile($edited_layout_file);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue