merge -r18667 from trunk - improved page title when viewing tags, fix canonical url on index page if the webmaster changes the default number of thumbnails per page

git-svn-id: http://piwigo.org/svn/branches/2.4@18668 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 6 insertions, 1 deletions

diff --git a/index.php b/index.php
index 02cd6369f..90d30ca28 100644
--- a/index.php
+++ b/index.php
@@ -99,7 +99,12 @@ if (isset($page['is_homepage']) and $page['is_homepage'])
 }
 else
 {
-  $canonical_url = duplicate_index_url();
+  $start = $page['nb_image_page'] * round($page['start'] / $page['nb_image_page']);
+  if ($start>0 && $start >= count($page['items']) )
+  {
+    $start -= $page['nb_image_page'];
+  }
+  $canonical_url = duplicate_index_url(array('start' => $start));
 }
 $template->assign('U_CANONICAL', $canonical_url);