diff --git a/files/sys/system.js b/files/sys/system.js index bb70d72..2098fc0 100644 --- a/files/sys/system.js +++ b/files/sys/system.js @@ -80,10 +80,10 @@ SYSTEM.prototype.load = function(id){ async: false, data: {}, dataType: 'html', - url: entry['url'], + url: entry['url']+'&'+window.location.search.substr(1), success: function(data){ $(entry['div']).html(data); - system.log(system.LOG_INFO,'load page: '+id+entry['div']+' - success');}, + system.log(system.LOG_INFO,'load page: '+id+entry['div']+' '+entry['url']+'&'+window.location.search.substr(1)+' - success');}, error: function(XMLHttpRequest, textStatus, errorThrown){system.log(system.LOG_ERROR,errorThrown);} }); //load css diff --git a/page/replace.php b/page/replace.php index 532735f..4cd129c 100644 --- a/page/replace.php +++ b/page/replace.php @@ -1,21 +1,18 @@ $value){ + if(!is_array($value)){ + $search[] = '/\${'.$key.'}/'; + $replace[] = $value;} + } return @preg_replace($search, $replace, $text); } public static function replaceFile($path, $vars){