Changeset 2198:e9f1e3b6a3ad

Timestamp:

10/02/13 09:43:49 (12 years ago)

Author:

Dsls

Branch:

default

Message:

includesubcats suddenly swallowed by core

Files:

• admin/blog_pref.php (modified) (2 diffs)
• inc/core/class.dc.core.php (modified) (1 diff)
• inc/public/class.dc.template.php (modified) (1 diff)
• plugins/widgets/_default_widgets.php (modified) (1 diff)
• plugins/widgets/_widgets_functions.php (modified) (1 diff)

admin/blog_pref.php

@@ -235 +235 @@
           $blog_settings->system->put('nb_post_per_page',$nb_post_per_page);
           $blog_settings->system->put('use_smilies',!empty($_POST['use_smilies']));
+          $blog_settings->system->put('inc_subcats',!empty($_POST['inc_subcats']));
           $blog_settings->system->put('media_img_t_size',$media_img_t_size);
           $blog_settings->system->put('media_img_s_size',$media_img_s_size);
@@ -528 +529 @@
      form::checkbox('short_feed_items','1',$blog_settings->system->short_feed_items).
      __('Truncate feeds').'</label></p>'.
+     
+     '<p><label for="inc_subcats" class="classic">'.
+     form::checkbox('inc_subcats','1',$blog_settings->system->inc_subcats).
+     __('Include sub-categories in category page and category posts feed').'</label></p>'.
      '</div>'.
     '</div>'.

inc/core/class.dc.core.php

@@ -1342 +1342 @@
                     array('use_smilies','boolean',false,
                     'Show smilies on entries and comments'),
+                    array('inc_subcats','boolean',false,
+                    'Include sub-categories in category page and category posts feed'),
                     array('wiki_comments','boolean',false,
                     'Allow commenters to use a subset of wiki syntax')

inc/public/class.dc.template.php

@@ -1211 +1211 @@
                     $p .=
                     'if ($_ctx->exists("categories")) { '.
-                         "\$params['cat_id'] = \$_ctx->categories->cat_id; ".
+                         "\$params['cat_id'] = \$_ctx->categories->cat_id.(\$core->blog->settings->system->inc_subcats?' ?sub':'');".
                     "}\n";
                }

plugins/widgets/_default_widgets.php

@@ -50 +50 @@
 $__widgets->categories->setting('title',__('Title:'),__('Categories'));
 $__widgets->categories->setting('postcount',__('With entries counts'),0,'check');
+$__widgets->categories->setting('subcatscount', __('Include sub cats in count'), false, 'check');
 $__widgets->categories->setting('with_empty',__('Include empty categories'),0,'check');
 $__widgets->categories->setting('homeonly',__('Display on:'),0,'combo',

plugins/widgets/_widgets_functions.php

@@ -108 +108 @@
                '<a href="'.$core->blog->url.$core->url->getURLFor('category', $rs->cat_url).'">'.
                html::escapeHTML($rs->cat_title).'</a>'.
-               ($w->postcount ? ' <span>('.$rs->nb_post.')</span>' : '');
+               ($w->postcount ? ' <span>('.($w->subcatscount ? $rs->nb_total : $rs->nb_post).')</span>' : '');