Changeset 18579 for trunk/include

Timestamp:

Oct 9, 2012, 9:47:22 PM (12 years ago)

Author:

rvelices

Message:

some code simplification

File:

• trunk/include/functions_category.inc.php (modified) (8 diffs)

trunk/include/functions_category.inc.php

@@ -129 +129 @@
       $row['icon_ts'] = get_icon($row['max_date_last'], $child_date_last);
     }
-    array_push($cats, $row);
+    $cats[] = $row;
     if ($row['id']==@$page['category']['id']) //save the number of subcats for later optim
       $page['category']['count_categories'] = $row['count_categories'];
@@ -196 +196 @@
   else
   {
-    $names = array();
     $query = '
   SELECT id, name, permalink
@@ -208 +207 @@
     foreach ($upper_ids as $cat_id)
     {
-      array_push( $cat['upper_names'], $names[$cat_id]);
+      $cat['upper_names'][] = $names[$cat_id];
     }
   }
@@ -220 +219 @@
 {
   global $conf, $page;
-    
+
   return trigger_event('get_category_preferred_image_orders', array(
     array(l10n('Default'),                        '',                     true),
@@ -226 +225 @@
     array(l10n('Photo title, Z → A'),        'name DESC',            true),
     array(l10n('Date created, new → old'),   'date_creation DESC',   true),
-    array(l10n('Date created, old → new'),   'date_creation ASC',    true), 
+    array(l10n('Date created, old → new'),   'date_creation ASC',    true),
     array(l10n('Date posted, new → old'),    'date_available DESC',  true),
     array(l10n('Date posted, old → new'),    'date_available ASC',   true),
@@ -247 +246 @@
   foreach ($categories as $category)
   {
-    if (!empty($category['permalink']))
-    {
-      $category['name'] .= ' √';
-    }
     if ($fullname)
     {
@@ -284 +279 @@
                                     $fullname = true)
 {
-  $result = pwg_query($query);
-  $categories = array();
-  if (!empty($result))
-  {
-    while ($row = pwg_db_fetch_assoc($result))
-    {
-      array_push($categories, $row);
-    }
-  }
+  $categories = array_from_query($query);
   usort($categories, 'global_rank_compare');
   display_select_categories($categories, $selecteds, $blockname, $fullname);
@@ -325 +312 @@
   $query.= '
 ;';
-  $result = pwg_query($query);
-
-  $subcats = array();
-  while ($row = pwg_db_fetch_assoc($result))
-  {
-    array_push($subcats, $row['id']);
-  }
-  return $subcats;
+  return array_from_query($query, 'id');
 }