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

merge from 1.5.3 (~r10943)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/module/module.controller.php
View file

@ -149,14 +149,6 @@
$origin_config->{$key} = $val;
}
//remove from cache
$oCacheHandler = &CacheHandler::getInstance('object');
if($oCacheHandler->isSupport())
{
$cache_key = 'object:module_config:module_'.$module.'_site_srl_'.$site_srl;
$oCacheHandler->delete($cache_key);
}
return $this->insertModuleConfig($module, $origin_config, $site_srl);
}
@ -703,8 +695,11 @@
/**
* @brief Change user-defined language
**/
function replaceDefinedLangCode(&$output) {
$output = preg_replace_callback('!\$user\_lang\-\>([A-Za-z0-9\_]+)!s', array($this,'_replaceLangCode'), $output);
function replaceDefinedLangCode(&$output, $isReplaceLangCode = true) {
if($isReplaceLangCode)
{
$output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this,'_replaceLangCode'), $output);
}
}
function _replaceLangCode($matches) {
static $lang = null;
@ -788,7 +783,7 @@
if (!$ajax)
{
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminFileBox');
header('location:'.$returnUrl);
$this->setRedirectUrl($returnUrl);
return;
}
else