aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-10-24 04:04:27 +0000
committerrvelices <rv-github@modusoptimus.com>2006-10-24 04:04:27 +0000
commitb8cf9d8fd990fdb34a14f36b867714d116c672b3 (patch)
tree235b1765c483f8ca5b11d4eb9f19460b65992868 /include
parent0fdfd9081ac89646c1bc087442ad81add459a817 (diff)
merge -r1563 from trunk to branch-1_6 comments.php: cleanup url (t=1 in the
url for an unknown reason) and image urls work now with all url styles git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1576 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/functions_html.inc.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 993c46dea..58cf3b8e1 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -82,7 +82,8 @@ function create_navigation_bar(
global $lang, $conf;
$pages_around = $conf['paginate_pages_around'];
- $start_str = $clean_url ? '/start-' : '&amp;start=';
+ $start_str = $clean_url ? '/start-' :
+ ( ( strstr($url, '?')===false ? '?':'&amp;') . 'start=' );
$navbar = '';