fix bug #1461728 - pubdate field not configurable

diff --git a/include/plugin_internal.inc.php b/include/plugin_internal.inc.php
index d3a32368ca724a10789920e08f5f085c1f13441c..874931f8017aa4a0b4f881f509fe715cfbe2ffbe 100644 (file)
--- a/include/plugin_internal.inc.php
+++ b/include/plugin_internal.inc.php
@@ -2,6 +2,11 @@
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
+if (defined('S9Y_FRAMEWORK_PLUGIN_INTERNAL')) {
+    return;
+}
+@define('S9Y_FRAMEWORK_PLUGIN_INTERNAL', true);
+
 class serendipity_calendar_plugin extends serendipity_plugin {
     var $title = CALENDAR;
 
@@ -404,8 +409,6 @@ class serendipity_archives_plugin extends serendipity_plugin {
 
         $ts = mktime(0, 0, 0, date('m'), 1);
 
-        require_once S9Y_INCLUDE_PATH . 'include/functions_calendars.inc.php';
-
         $add_query = '';
         if (isset($serendipity['GET']['category'])) {
             $base_query   = 'C' . (int)$serendipity['GET']['category'];
@@ -428,6 +431,7 @@ class serendipity_archives_plugin extends serendipity_plugin {
                             $ts = mktime(0, 0, 0, date('m', $ts)-1, 1, date('Y', $ts)); // Must be last in 'case' statement
                             break;
                         case 'persian-utf8':
+                            require_once S9Y_INCLUDE_PATH . 'include/functions_calendars.inc.php';
                             $linkStamp = persian_date_utf('Y/m', $ts);
                             $ts_title = serendipity_formatTime("%B %Y", $ts, false);
                             $ts = persian_mktime(0, 0, 0, persian_date_utf('m', $ts)-1, 1, persian_date_utf('Y', $ts)); // Must be last in 'case' statement
@@ -443,6 +447,7 @@ class serendipity_archives_plugin extends serendipity_plugin {
                             $ts = mktime(0, 0, 0, date('m', $ts), date('d', $ts)-7, date('Y', $ts));
                             break;
                         case 'persian-utf8':
+                            require_once S9Y_INCLUDE_PATH . 'include/functions_calendars.inc.php';
                             $linkStamp = persian_date_utf('Y/\WW', $ts);
                             $ts_title = WEEK . ' '. persian_date_utf('W، Y', $ts);
                             $ts = persian_mktime(0, 0, 0, persian_date_utf('m', $ts), persian_date_utf('d', $ts)-7, persian_date_utf('Y', $ts));
@@ -458,6 +463,7 @@ class serendipity_archives_plugin extends serendipity_plugin {
                             $ts = mktime(0, 0, 0, date('m', $ts), date('d', $ts)-1, date('Y', $ts)); // Must be last in 'case' statement
                             break;
                         case 'persian-utf8':
+                            require_once S9Y_INCLUDE_PATH . 'include/functions_calendars.inc.php';
                             $linkStamp = persian_date_utf('Y/m/d', $ts);
                             $ts_title = serendipity_formatTime("%e %B %Y", $ts, false);
                             $ts = persian_mktime(0, 0, 0, persian_date_utf('m', $ts), persian_date_utf('d', $ts)-1, persian_date_utf('Y', $ts)); // Must be last in 'case' statement
@@ -787,7 +793,7 @@ class serendipity_syndication_plugin extends serendipity_plugin {
                 $propbag->add('type',        'boolean');
                 $propbag->add('name',        SYNDICATION_PLUGIN_PUBDATE);
                 $propbag->add('description', SYNDICATION_PLUGIN_PUBDATE_DESC);
-                $propbag->add('default',     '');
+                $propbag->add('default',     true);
                 break;
 
             case 'bannerURL':
@@ -996,7 +1002,7 @@ IMAGE;
 
                 switch($match[1]) {
                     case 'pubDate':
-                        if ($bag_content != 'false') {
+                        if (serendipity_db_bool($bag_content)) {
                             $bag_content = gmdate('D, d M Y H:i:s \G\M\T', serendipity_serverOffsetHour($entries[0]['last_modified']));
                         } else {
                             $bag_content = '';
@@ -1382,7 +1388,7 @@ class serendipity_categories_plugin extends serendipity_plugin {
         if ($which_category === "login") {
             $which_category = (int)$serendipity['authorid'];
         }
-            
+
         $categories = serendipity_fetchCategories(empty($which_category) ? 'all' : $which_category, '', $sort);
 
         $cat_count = array();
@@ -1643,4 +1649,3 @@ class serendipity_authors_plugin extends serendipity_plugin {
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>