backport of important function cleanup

diff --git a/include/functions_calendars.inc.php b/include/functions_calendars.inc.php
index a512019a469c94f9c2bc7bf28965bbd2b53f014d..edf3adef5c4268ae63f0e71142b323e18b533c91 100644 (file)
--- a/include/functions_calendars.inc.php
+++ b/include/functions_calendars.inc.php
@@ -214,7 +214,7 @@ function jalali_strftime_utf($format, $timestamp) {
                     $output_str.=strftime('%z', $timestamp);
                     break;
                 case '%':
-                    $outpus_str.='%';
+                    $output_str.='%';
                     break;
             }
         }else{

diff --git a/include/functions_trackbacks.inc.php b/include/functions_trackbacks.inc.php
index e17f20eb458225af55e7d76cd3321dbe8f7c7971..af5e51c1c88c3b1ab04fb4a271614dfaf2a6725c 100644 (file)
--- a/include/functions_trackbacks.inc.php
+++ b/include/functions_trackbacks.inc.php
@@ -22,6 +22,7 @@ function serendipity_trackback_is_success($resp) {
 }
 
 function serendipity_pingback_autodiscover($loc, $body) {
+global $serendipity;
     if (!empty($_SERVER['X-PINGBACK'])) {
         $pingback = $_SERVER['X-PINGBACK'];
     } elseif (preg_match('@<link rel="pingback" href="([^"]+)" ?/?>@i', $body, $matches)) {

diff --git a/rss.php b/rss.php
index 165f78bccff1e0c0757c60b2a04f6856581e3b1b..f54c252b6e1f448158ff84ea9dddeb218e9f5d2a 100644 (file)
--- a/rss.php
+++ b/rss.php
@@ -103,7 +103,7 @@ $metadata = array(
     'title'             => $title,
     'description'       => $description,
     'language'          => $serendipity['lang'],
-    'additional_fields' => $additional_fields,
+    'additional_fields' => array(),
     'link'              => $serendipity['baseURL'],
     'email'             => $serendipity['email'],
     'fullFeed'          => false,