From a437e15fcc923069ef9be43e843ebbdf99626c7a Mon Sep 17 00:00:00 2001 From: rvelices Date: Sat, 24 Jun 2006 21:23:10 +0000 Subject: 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 --- include/functions_url.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') 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); } } -- cgit v1.2.3