merge r3117 from trunk:

- fix use $page['nb_image_page'] instead of $user... when creating the nav bar (same as category_default)
- rewrote function format_date without regular expressions (faster); parameter date type is not used anymore (but I left it there for now)

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

1 files changed, 1 insertions, 1 deletions

diff --git a/index.php b/index.php
index 2993e20f4..eaea36635 100644
--- a/index.php
+++ b/index.php
@@ -70,7 +70,7 @@ if (count($page['items']) > $user['nb_image_page'])
     duplicate_index_url(array(), array('start')),
     count($page['items']),
     $page['start'],
-    $user['nb_image_page'],
+    $page['nb_image_page'],
     true
     );
 }