fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge code from github to bitbucket 2014-08-14

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-08-14 13:53:06 -04:00
parent 9c3d298c26 1c9679d83b
commit 1d89dc5d13
37 changed files with 484 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.system.php
View File

@@ -1142,7 +1142,7 @@ class System
@preg_match( $patt, $content, $match );
if (is_array( $match ) && count( $match ) > 0 && isset( $match[1] )) {
$newUrl = 'sys/' . $conf['lang'] . '/' . $conf['skin'] . '/login/login';
$newUrl = "sys/" . (($conf["lang"] != "")? $conf["lang"] : ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en")) . "/" . $conf["skin"] . "/login/login";
$newMetaStr = str_replace( $match[1], $newUrl, $match[0] );
$newContent = str_replace( $match[0], $newMetaStr, $content );