Ticket #18309: simplepie-1-2.diff

class-simplepie.php

@@ -1 +1 @@
 <?php
-if ( !class_exists( 'SimplePie' ) ) :
 /**
  * SimplePie
  *
@@ -1831 +1830 @@
         }
 
         /**
-         * Return the error message for the occurred error
+         * Return the error message for the occured error
          *
          * @access public
          * @return string Error message
@@ -4067 +4066 @@
                                         $temp = explode(':', $this->sanitize($duration_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
                                         if (sizeof($temp) > 0)
                                         {
-                                                $seconds = (int) array_pop($temp);
+                                                (int) $seconds = array_pop($temp);
                                         }
                                         if (sizeof($temp) > 0)
                                         {
-                                                $minutes = (int) array_pop($temp);
+                                                (int) $minutes = array_pop($temp);
                                                 $seconds += $minutes * 60;
                                         }
                                         if (sizeof($temp) > 0)
                                         {
-                                                $hours = (int) array_pop($temp);
+                                                (int) $hours = array_pop($temp);
                                                 $seconds += $hours * 3600;
                                         }
                                         unset($temp);
@@ -9427 +9426 @@
                 }
 
                 // This is first, as behaviour of this is completely predictable
-                if ($input === 'windows-1252' && $output === 'UTF-8')
+                if ($input === 'Windows-1252' && $output === 'UTF-8')
                 {
                         return SimplePie_Misc::windows_1252_to_utf8($data);
                 }
@@ -14998 +14997 @@
                 }
         }
 }
-endif;
+
 ?>