Changeset 1861 for trunk/include/functions_calendar.inc.php

Timestamp:

Feb 27, 2007, 2:56:16 AM (17 years ago)

Author:

rvelices

Message:

• refactoring pagecategory before 1.7 release

pagecategory is not an id anymore, but an associative array of category info
all of pagecat_xxx or pageuppercats merged into one
simplifies calls to make_index_url
give plugins a clean start for page variables for version 1.7

File:

• trunk/include/functions_calendar.inc.php (modified) (3 diffs)

trunk/include/functions_calendar.inc.php

@@ -2 +2 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -35 +34 @@
   $inner_sql = ' FROM ' . IMAGES_TABLE;
 
-  if ($page['section']=='categories' or
-      ( isset($page['category']) and is_numeric($page['category']) ) )
+  if ($page['section']=='categories')
   { // we will regenerate the items by including subcats elements
     $page['items'] = array();
@@ -42 +40 @@
 INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id';
 
-    if (isset($page['category']) and is_numeric($page['category']))
+    if ( isset($page['category']) )
     {
       $sub_ids = array_diff(
-        get_subcat_ids(array($page['category'])),
+        get_subcat_ids(array($page['category']['id'])),
         explode(',', $user['forbidden_categories'])
         );