fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-04 17:44:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1368

Browse source 
Conflicts:
	classes/module/ModuleHandler.class.php
This commit is contained in:
bnu 2015-07-06 14:53:20 +09:00
commit 97bb66527f
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
classes/db/DB.class.php
View file

@ -294,8 +294,7 @@ class DB
unset($oDB); unset($oDB);
require_once($class_file); require_once($class_file);
$tmp_fn = create_function('', "return new {$class_name}();"); $oDB = new $class_name();
$oDB = $tmp_fn();
if(!$oDB) if(!$oDB)
{ {

17
config/func.inc.php
View file

@ -724,22 +724,19 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = TRUE)
$month = (int) substr($str, 4, 2); $month = (int) substr($str, 4, 2);
$day = (int) substr($str, 6, 2); $day = (int) substr($str, 6, 2);
// leading zero?
$lz = create_function('$n', 'return ($n>9?"":"0").$n;');
$trans = array( $trans = array(
'Y' => $year, 'Y' => $year,
'y' => $lz($year % 100), 'y' => sprintf('%02d', $year % 100),
'm' => $lz($month), 'm' => sprintf('%02d', $month),
'n' => $month, 'n' => $month,
'd' => $lz($day), 'd' => sprintf('%02d', $day),
'j' => $day, 'j' => $day,
'G' => $hour, 'G' => $hour,
'H' => $lz($hour), 'H' => sprintf('%02d', $hour),
'g' => $hour % 12, 'g' => $hour % 12,
'h' => $lz($hour % 12), 'h' => sprintf('%02d', $hour % 12),
'i' => $lz($min), 'i' => sprintf('%02d', $min),
's' => $lz($sec), 's' => sprintf('%02d', $sec),
'M' => getMonthName($month), 'M' => getMonthName($month),
'F' => getMonthName($month, FALSE) 'F' => getMonthName($month, FALSE)
); );

3
modules/editor/editor.model.php
View file

@ -550,8 +550,7 @@ class editorModel extends editor
if(!file_exists($class_file)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component)); if(!file_exists($class_file)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
// Create an object after loading the class file // Create an object after loading the class file
require_once($class_file); require_once($class_file);
$tmp_fn = create_function('$seq,$path', "return new {$component}(\$seq,\$path);"); $oComponent = new $component($editor_sequence, $class_path);
$oComponent = $tmp_fn($editor_sequence, $class_path);
if(!$oComponent) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component)); if(!$oComponent) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
// Add configuration information // Add configuration information
$component_info = $this->getComponent($component, $site_srl); $component_info = $this->getComponent($component, $site_srl);