aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-06-24 21:23:10 +0000
committerrvelices <rv-github@modusoptimus.com>2006-06-24 21:23:10 +0000
commita437e15fcc923069ef9be43e843ebbdf99626c7a (patch)
tree69bb6c65168080ce9c0157b2ddd3e344796247f7 /include
parent7b791c1ba3ff2d078b57af0bec350376a984aa02 (diff)
merge -r1402 from branch-1_6 into trunk
bug correction in get_root_url ('./../' was returning '') git-svn-id: http://piwigo.org/svn/trunk@1403 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_url.inc.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php
index 9eb424651..46a9c8627 100644
--- a/include/functions_url.inc.php
+++ b/include/functions_url.inc.php
@@ -37,17 +37,17 @@ function get_root_url()
{
$root_url = $page['root_path'];
}
- else
+ else
{
$root_url = PHPWG_ROOT_PATH;
}
if ( dirname($root_url)!='.' )
{
return $root_url;
- }
- else
+ }
+ else
{
- return '';
+ return substr($root_url, 2);
}
}