aboutsummaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2012-10-04 15:03:55 +0000
committermistic100 <mistic@piwigo.org>2012-10-04 15:03:55 +0000
commitb1cec7bf86b84296acc97ffed090bf1686964420 (patch)
tree9525c06648ec2cc90a401efc06974a0b24198294 /index.php
parentb5f020ee66b13bce8275a4d64faf8710c362a6d1 (diff)
feature:2614 pagination on albums
return to old fashioned way (one query in category_cats), restoring recent_cats feature and "menubar optimization", rename "starta" into "startcat" git-svn-id: http://piwigo.org/svn/trunk@18462 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--index.php23
1 files changed, 8 insertions, 15 deletions
diff --git a/index.php b/index.php
index 12797cc0b..3f1848504 100644
--- a/index.php
+++ b/index.php
@@ -83,20 +83,7 @@ if (count($page['items']) > $page['nb_image_page'])
);
}
-$page['cats_navigation_bar'] = array();
-if (count($page['categories']) > $conf['nb_categories_page'])
-{
- $page['cats_navigation_bar'] = create_navigation_bar(
- duplicate_index_url(array(), array('starta')),
- count($page['categories']),
- $page['starta'],
- $conf['nb_categories_page'],
- true, 'starta'
- );
-}
-
-$template->assign( 'thumb_navbar', $page['navigation_bar'] );
-$template->assign( 'cats_navbar', $page['cats_navigation_bar'] );
+$template->assign('thumb_navbar', $page['navigation_bar'] );
// caddie filling :-)
if (isset($_GET['caddie']))
@@ -298,10 +285,16 @@ if ( isset($page['category']['count_categories']) and $page['category']['count_c
}
//------------------------------------------------------ main part : thumbnails
-if ( !empty($page['categories']) )
+if ( 0==$page['start']
+ and !isset($page['flat'])
+ and !isset($page['chronology_field'])
+ and ('recent_cats'==$page['section'] or 'categories'==$page['section'])
+ and (!isset($page['category']['count_categories']) or $page['category']['count_categories']>0 )
+)
{
include(PHPWG_ROOT_PATH.'include/category_cats.inc.php');
}
+
if ( !empty($page['items']) )
{
include(PHPWG_ROOT_PATH.'include/category_default.inc.php');