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

issue 314 remove error_return_url in getUrl function

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9525 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-10-10 07:06:08 +00:00
parent f449aced51
commit afa365b44b
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
config/func.inc.php
View file

@ -219,21 +219,23 @@
* 3. URL made of args_list added to RequestUri if the first argument value is ''. * 3. URL made of args_list added to RequestUri if the first argument value is ''.
**/ **/
function getUrl() { function getUrl() {
$num_args = func_num_args(); $num_args = func_num_args();
$args_list = func_get_args(); $args_list = func_get_args();
if(!$num_args) return Context::getRequestUri(); if($num_args) $url = Context::getUrl($num_args, $args_list);
else $url = Context::getRequestUri();
return Context::getUrl($num_args, $args_list); return preg_replace('@\berror_return_url=[^&]*|\w+=(?:&|$)@', '', $url);
} }
function getNotEncodedUrl() { function getNotEncodedUrl() {
$num_args = func_num_args(); $num_args = func_num_args();
$args_list = func_get_args(); $args_list = func_get_args();
if(!$num_args) return Context::getRequestUri(); if($num_args) $url = Context::getUrl($num_args, $args_list, null, false);
else $url = Context::getRequestUri();
return Context::getUrl($num_args, $args_list, null, false); return preg_replace('@\berror_return_url=[^&]*|\w+=(?:&|$)@', '', $url);
} }
/** /**