Changeset 2560 for trunk/admin/include/functions.php

Timestamp:

Sep 21, 2008, 1:06:20 PM (16 years ago)

Author:

rvelices

Message:

• fix function get_fulldirs - works correctly eent for wrong params (virtual cats)
• fix functions_metadata.php - could not be included from inside another function

File:

• trunk/admin/include/functions.php (modified) (3 diffs)

trunk/admin/include/functions.php

@@ -799 +799 @@
   WHERE dir IS NOT NULL
 ;';
-  $result = pwg_query($query);
-  $cat_dirs = array();
-  while ($row = mysql_fetch_array($result))
-  {
-    $cat_dirs[$row['id']] = $row['dir'];
-  }
+  $cat_dirs = simple_hash_from_query($query, 'id', 'dir');
 
   // caching galleries_url
@@ -811 +806 @@
   FROM '.SITES_TABLE.'
 ;';
-  $result = pwg_query($query);
-  $galleries_url = array();
-  while ($row = mysql_fetch_array($result))
-  {
-    $galleries_url[$row['id']] = $row['galleries_url'];
-  }
+  $galleries_url = simple_hash_from_query($query, 'id', 'galleries_url');
 
   // categories : id, site_id, uppercats
@@ -824 +814 @@
 SELECT id, uppercats, site_id
   FROM '.CATEGORIES_TABLE.'
-  WHERE id IN (
+  WHERE dir IS NOT NULL
+    AND id IN (
 '.wordwrap(implode(', ', $cat_ids), 80, "\n").')
 ;';