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

변수 충돌 부분 수정

Browse source
This commit is contained in:
conory 2016-03-03 12:32:31 +09:00
parent b9a8b15fe9
commit 6a351265ff
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/framework/lang.php
View file

@ -219,14 +219,14 @@ class Lang
// Separate the plugin name from the key. // Separate the plugin name from the key.
if (preg_match('/^[a-z0-9_.-]+$/i', $key) && ($keys = explode('.', $key, 2)) && count($keys) === 2) if (preg_match('/^[a-z0-9_.-]+$/i', $key) && ($keys = explode('.', $key, 2)) && count($keys) === 2)
{ {
list($plugin_name, $key) = $keys; list($plugin_name, $lang_key) = $keys;
if (!isset($this->_loaded_plugins[$plugin_name])) if (!isset($this->_loaded_plugins[$plugin_name]))
{ {
$this->loadPlugin($plugin_name); $this->loadPlugin($plugin_name);
} }
if (isset($this->_loaded_plugins[$plugin_name]->{$key})) if (isset($this->_loaded_plugins[$plugin_name]->{$lang_key}))
{ {
return $this->_loaded_plugins[$plugin_name]->{$key}; return $this->_loaded_plugins[$plugin_name]->{$lang_key};
} }
goto end_other_lang; goto end_other_lang;