Changeset 1610:2d5ebb2fcdfd

Timestamp:

08/29/13 09:38:58 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Fixes #472, <tpl:Categories> (new without_empty="0" attribute) and categories' widget ("Include empty categories" checkbox) may includes empty categories.

Files:

• inc/core/class.dc.blog.php (modified) (1 diff)
• inc/public/class.dc.template.php (modified) (1 diff)
• inc/public/lib.urlhandlers.php (modified) (1 diff)
• locales/fr/plugins.po (modified) (1 diff)
• plugins/widgets/_default_widgets.php (modified) (1 diff)
• plugins/widgets/_widgets_functions.php (modified) (1 diff)

inc/core/class.dc.blog.php

@@ -311 +311 @@
           $counter = $this->getCategoriesCounter($c_params);
           
-          $without_empty = $this->core->auth->userID() == false; # For public display
+          if (isset($params['without_empty']) && ($params['without_empty'] == false)) {
+               $without_empty = false;
+          } else {
+               $without_empty = $this->core->auth->userID() == false; # Get all categories if in admin display
+          }
           
           $start = isset($params['start']) ? (integer) $params['start'] : 0;

inc/public/class.dc.template.php

@@ -955 +955 @@
                $p .= "\$params['level'] = ".(integer) $attr['level'].";\n";
           }
+
+          if (isset($attr['without_empty']) && ((boolean) $attr['without_empty'] == false)) {
+               $p .= '$params[\'without_empty\'] = false;';
+          }
           
           $res = "<?php\n";

inc/public/lib.urlhandlers.php

@@ -263 +263 @@
                $params = new ArrayObject(array(
                     'cat_url' => $args,
-                    'post_type' => 'post'));
+                    'post_type' => 'post',
+                    'without_empty' => false));
                
                $core->callBehavior('publicCategoryBeforeGetCategories',$params,$args);

locales/fr/plugins.po

@@ -1675 +1675 @@
 msgstr "Avec le nombre de billets"
 
+msgid "Include empty categories"
+msgstr "Inclure les catégories vides"
+
 msgid "Subscribe links"
 msgstr "Liens de souscription"

plugins/widgets/_default_widgets.php

@@ -47 +47 @@
 $__widgets->langs->setting('class',__('CSS class:'),'');
 
-$__widgets->create('categories',__('Categories list'),array('defaultWidgets','categories'),null,'List of categories');
+$__widgets->create('categories',__('Categories'),array('defaultWidgets','categories'),null,'List of categories');
 $__widgets->categories->setting('title',__('Title:'),__('Categories'));
 $__widgets->categories->setting('postcount',__('With entries counts'),0,'check');
+$__widgets->categories->setting('with_empty',__('Include empty categories'),0,'check');
 $__widgets->categories->setting('homeonly',__('Display on:'),0,'combo',
      array(__('All pages') => 0, __('Home page only') => 1, __('Except on home page') => 2));

plugins/widgets/_widgets_functions.php

@@ -77 +77 @@
           }
 
-          $rs = $core->blog->getCategories(array('post_type'=>'post'));
+          $rs = $core->blog->getCategories(array('post_type'=>'post','without_empty'=> !$w->with_empty));
           if ($rs->isEmpty()) {
                return;