fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 19:21:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix unnecessary assignment by reference, which causes E_NOTICE

Browse source
This commit is contained in:
Kijin Sung 2024-01-04 01:16:40 +09:00
parent ed15587c4f
commit 6c113c22ed
35 changed files with 80 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/editor/components/emoticon/emoticon.class.php
View file

@ -99,7 +99,7 @@ class emoticon extends EditorHandler
$tpl_path = $this->component_path.'tpl';
$tpl_file = 'popup.html';
$oTemplate = &TemplateHandler::getInstance();
$oTemplate = TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);
}

4
modules/editor/components/image_gallery/image_gallery.class.php
View file

@ -31,7 +31,7 @@ class image_gallery extends EditorHandler
Context::set("tpl_path", $tpl_path);
$oTemplate = &TemplateHandler::getInstance();
$oTemplate = TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);
}
@ -86,7 +86,7 @@ class image_gallery extends EditorHandler
if($gallery_info->gallery_style == "list") $tpl_file = 'list_gallery.html';
else $tpl_file = 'slide_gallery.html';
$oTemplate = &TemplateHandler::getInstance();
$oTemplate = TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);
}
}

2
modules/editor/components/image_link/image_link.class.php
View file

@ -31,7 +31,7 @@ class image_link extends EditorHandler
Context::set("tpl_path", $tpl_path);
$oTemplate = &TemplateHandler::getInstance();
$oTemplate = TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);
}

4
modules/editor/components/poll_maker/poll_maker.class.php
View file

@ -33,7 +33,7 @@ class poll_maker extends EditorHandler
$tpl_path = $this->component_path.'tpl';
$tpl_file = 'popup.html';
$oTemplate = &TemplateHandler::getInstance();
$oTemplate = TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);
}
@ -71,7 +71,7 @@ class poll_maker extends EditorHandler
Context::set('style', $args->style);
// Compile a template
$oTemplate = &TemplateHandler::getInstance();
$oTemplate = TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);
}
}

16
modules/editor/editor.controller.php
View file

@ -52,8 +52,8 @@ class EditorController extends Editor
throw new Rhymix\Framework\Exception('msg_component_is_not_founded', $component);
}
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($component);
$oEditorModel = EditorModel::getInstance();
$oComponent = $oEditorModel->getComponentObject($component);
if(!$oComponent->toBool()) return $oComponent;
if(!method_exists($oComponent, $method))
@ -211,11 +211,11 @@ class EditorController extends Editor
$module_srl = $module_info->module_srl ?? 0;
if($module_srl)
{
$editor_config = getModel('editor')->getEditorConfig($module_srl);
$editor_config = EditorModel::getEditorConfig($module_srl);
}
else
{
$editor_config = getModel('module')->getModuleConfig('editor');
$editor_config = ModuleModel::getModuleConfig('editor');
}
if ($editor_config)
@ -280,8 +280,8 @@ class EditorController extends Editor
}
// Get converted codes by using component::transHTML()
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
$oEditorModel = EditorModel::getInstance();
$oComponent = $oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
if(!is_object($oComponent) || !method_exists($oComponent, 'transHTML'))
{
return $match[0];
@ -327,9 +327,7 @@ class EditorController extends Editor
{
$editor_sequence = Context::get('editor_sequence');
$primary_key = Context::get('primary_key');
$oEditorModel = getModel('editor');
$saved_doc = $oEditorModel->getSavedDoc(null);
$saved_doc = EditorModel::getSavedDoc(null);
FileController::setUploadInfo($editor_sequence, $saved_doc->document_srl, intval($saved_doc->module_srl));
$vars = $this->getVariables();

5
modules/editor/editor.view.php
View file

@ -62,8 +62,7 @@ class EditorView extends Editor
$site_module_info = Context::get('site_module_info');
$site_srl = (int)$site_module_info->site_srl;
// Get compoenet object
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl);
$oComponent = EditorModel::getComponentObject($component, $editor_sequence, $site_srl);
if(!$oComponent->toBool())
{
Context::set('message', sprintf($oComponent->getMessage(), $component));
@ -174,7 +173,7 @@ class EditorView extends Editor
$security->encodeHTML('editor_comment_colorset_list..title');
// Set a template file
$oTemplate = &TemplateHandler::getInstance();
$oTemplate = TemplateHandler::getInstance();
$tpl = $oTemplate->compile($this->module_path.'tpl', 'editor_module_config');
$obj .= $tpl;