Changeset 1775:fd4b24fb574d

Timestamp:

09/10/13 11:29:38 (12 years ago)

Author:

Dsls

Branch:

default

Message:

Much better this way, see #1564

Files:

• admin/posts.php (modified) (2 diffs)
• inc/admin/lib.admincombos.php (modified) (1 diff)

admin/posts.php

@@ -53 +53 @@
 
      $categories_combo = array_merge(
-          array('-' => ''),
-          dcAdminCombos::getCategoriesCombo($categories)
-     );
-     $categories_combo[__('(No cat)')] = 'NULL';
+          array(
+               new formSelectOption('-',''),
+               new formSelectOption(__('(No cat)'),'NULL')),          
+          dcAdminCombos::getCategoriesCombo($categories,false)
+     );
+     $categories_values = array();
+     foreach ($categories_combo as $cat) {
+          if (isset($cat->value)) {
+               $categories_values[$cat->value]=true;
+          }
+     }
      
      $status_combo = array_merge(
@@ -161 +168 @@
 
 # - Categories filter
-if ($cat_id !== '' && in_array($cat_id,$categories_combo)) {
+if ($cat_id !== '' && isset($categories_values[$cat_id])) {
      $params['cat_id'] = $cat_id;
      $show_filters = true;

inc/admin/lib.admincombos.php

@@ -30 +30 @@
      @return   <b>array</b> the combo box (form::combo -compatible format)
      */
-     public static function getCategoriesCombo($categories) {
-          $categories_combo[__('(No cat)')] = '';
+     public static function getCategoriesCombo($categories,$include_empty = true) {
+          $categories_combo = array();
+          if ($include_empty) {
+               $categories_combo = array(new formSelectOption(__('(no cat)'),''));
+          }
           while ($categories->fetch()) {
                $categories_combo[] = new formSelectOption (