aboutsummaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-12-30 19:47:17 +0000
committerrvelices <rv-github@modusoptimus.com>2010-12-30 19:47:17 +0000
commitff36bf3b70b58a117b7ccfe72d0f3faf58d97f34 (patch)
tree5ee59ce55e533f17b3791885538b10fa9ed9c7ce /index.php
parent2ca0da39fbf476dd144dba440f94f1ffb045f117 (diff)
index.tpl and thumbnails change: category description above thumbs and enclosing ul moved to index.tpl
fix some combine_xxx git-svn-id: http://piwigo.org/svn/trunk@8401 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--index.php32
1 files changed, 15 insertions, 17 deletions
diff --git a/index.php b/index.php
index f31abe978..f4b4ebb02 100644
--- a/index.php
+++ b/index.php
@@ -26,13 +26,22 @@ define('PHPWG_ROOT_PATH','./');
include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
include(PHPWG_ROOT_PATH.'include/section_init.inc.php');
-trigger_action('loc_begin_index');
-
-// +-----------------------------------------------------------------------+
-// | Check Access and exit when user status is not ok |
-// +-----------------------------------------------------------------------+
+// Check Access and exit when user status is not ok
check_status(ACCESS_GUEST);
+if (!isset($page['start']))
+{
+ $page['start'] = 0;
+}
+
+// access authorization check
+if (isset($page['category']))
+{
+ check_restrictions($page['category']['id']);
+}
+
+trigger_action('loc_begin_index');
+
//---------------------------------------------- change of image display order
if (isset($_GET['image_order']))
{
@@ -52,17 +61,6 @@ if (isset($_GET['image_order']))
);
}
//-------------------------------------------------------------- initialization
-// detection of the start picture to display
-if (!isset($page['start']))
-{
- $page['start'] = 0;
-}
-
-// access authorization check
-if (isset($page['category']))
-{
- check_restrictions($page['category']['id']);
-}
$page['navigation_bar'] = array();
if (count($page['items']) > $user['nb_image_page'])
@@ -255,7 +253,7 @@ if ( $conf['index_sort_order_input']
}
// category comment
-if (isset($page['comment']) and $page['comment'] != '')
+if ($page['start']==0 and !isset($page['chronology_field']) and !empty($page['comment']) )
{
$template->assign('CONTENT_DESCRIPTION', $page['comment'] );
}