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

Merge branch 'hotfix/1.7.11' into develop

Browse source
This commit is contained in:
bnu 2015-02-17 14:57:26 +09:00
commit 94d0a90581
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
classes/context/Context.class.php
View file

@ -367,6 +367,8 @@ class Context
$this->allow_rewrite = ($this->db_info->use_rewrite == 'Y' ? TRUE : FALSE); $this->allow_rewrite = ($this->db_info->use_rewrite == 'Y' ? TRUE : FALSE);
// set locations for javascript use // set locations for javascript use
$url = array();
$current_url = self::getRequestUri();
if($_SERVER['REQUEST_METHOD'] == 'GET') if($_SERVER['REQUEST_METHOD'] == 'GET')
{ {
if($this->get_vars) if($this->get_vars)
@ -386,17 +388,21 @@ class Context
$url[] = $key . '=' . urlencode($val); $url[] = $key . '=' . urlencode($val);
} }
} }
$this->set('current_url', self::getRequestUri() . '?' . join('&', $url));
$current_url = self::getRequestUri();
if($url) $current_url .= '?' . join('&', $url);
} }
else else
{ {
$this->set('current_url', $this->getUrl()); $current_url = $this->getUrl();
} }
} }
else else
{ {
$this->set('current_url', self::getRequestUri()); $current_url = self::getRequestUri();
} }
$this->set('current_url', $current_url);
$this->set('request_uri', self::getRequestUri()); $this->set('request_uri', self::getRequestUri());
} }
@ -1157,6 +1163,7 @@ class Context
{ {
continue; continue;
} }
$key = htmlentities($key);
$val = $this->_filterRequestVar($key, $val); $val = $this->_filterRequestVar($key, $val);
if($requestMethod == 'GET' && isset($_GET[$key])) if($requestMethod == 'GET' && isset($_GET[$key]))

7
common/tpl/redirect.html
View file

@ -5,8 +5,9 @@
</head> </head>
<body> <body>
<script> <script>
var idx = location.href.indexOf('?'); var url = location.href;
var url = parent.location.href; var idx = url.indexOf('?');
if(idx > -1 ) { if(idx > -1 ) {
var query_string = location.href.substr(idx+1, location.href.length); var query_string = location.href.substr(idx+1, location.href.length);
var args = {}; var args = {};
@ -23,4 +24,4 @@
} }
</script> </script>
</body> </body>
</html> </html>

2
config/config.inc.php
View file

@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
/** /**
* Display XE's full version. * Display XE's full version.
*/ */
define('__XE_VERSION__', '1.7.10'); define('__XE_VERSION__', '1.7.11');
define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false)); define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false)); define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false)); define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));