fix bug #1461728 - pubdate field not configurable

diff --git a/include/plugin_internal.inc.php b/include/plugin_internal.inc.php
index 3f1193d93e7ed891dff7416e24b8cc5892578822..d6e879307cdf48800e00e3ae39e6af462e158f61 100644 (file)
--- a/include/plugin_internal.inc.php
+++ b/include/plugin_internal.inc.php
@@ -404,8 +404,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 +426,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 'jalali-utf8':
+                            require_once S9Y_INCLUDE_PATH . 'include/functions_calendars.inc.php';
                             $linkStamp = jalali_date_utf('Y/m', $ts);
                             $ts_title = serendipity_formatTime("%B %Y", $ts, false);
                             $ts = jalali_mktime(0, 0, 0, jalali_date_utf('m', $ts)-1, 1, jalali_date_utf('Y', $ts)); // Must be last in 'case' statement
@@ -443,6 +442,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 'jalali-utf8':
+                            require_once S9Y_INCLUDE_PATH . 'include/functions_calendars.inc.php';
                             $linkStamp = jalali_date_utf('Y/\WW', $ts);
                             $ts_title = WEEK . ' '. jalali_date_utf('W، Y', $ts);
                             $ts = jalali_mktime(0, 0, 0, jalali_date_utf('m', $ts), jalali_date_utf('d', $ts)-7, jalali_date_utf('Y', $ts));
@@ -458,6 +458,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 'jalali-utf8':
+                            require_once S9Y_INCLUDE_PATH . 'include/functions_calendars.inc.php';
                             $linkStamp = jalali_date_utf('Y/m/d', $ts);
                             $ts_title = serendipity_formatTime("%e %B %Y", $ts, false);
                             $ts = jalali_mktime(0, 0, 0, jalali_date_utf('m', $ts), jalali_date_utf('d', $ts)-1, jalali_date_utf('Y', $ts)); // Must be last in 'case' statement
@@ -787,7 +788,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 +997,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 = '';