Index: trunk/admin/include/sections.php =================================================================== diff -u -r1510 -r1566 --- trunk/admin/include/sections.php (.../sections.php) (revision 1510) +++ trunk/admin/include/sections.php (.../sections.php) (revision 1566) @@ -79,15 +79,40 @@ $url = $rootURL.$this->Get("icon_small"); return $url; } + + function IsKernel4Link() { + $path = $this->Get('path'); + if(!$path) return false; + return ( strpos($path, 'index4.php') !== false) ? true : false; + } + function URL() { - global $rootURL; + global $rootURL, $m_var_list_update; - $env = BuildEnv(); - if(!$this->IsJavaScriptLink()) { + if ( $this->IsKernel4Link() ) { + global $var_list_update; + $stack_t = isset($var_list_update['t']) ? $var_list_update['t'] : null; + $var_list_update['t'] = $this->Get('file'); + $env = BuildEnv(); + $url = $rootURL.$this->Get("path"); + $url .= strstr($url,"?") ? '&env='.$env : '?env='.$env; + if ($stack_t == null) { + unset($var_list_update['t']); + } + else { + $var_list_update['t'] = $stack_t; + } + return $url; + } + else { + $m_var_list_update['opener']='r'; + $env = BuildEnv(); + } + $url = $rootURL.$this->Get("path").$this->Get("file"); if(strstr($url,"?")) { @@ -96,7 +121,7 @@ else $url .= "?env=".$env; } - else + else $url = $this->Get("file"); return $url; }