Wordpress 3.1.1

[autoinstalls/wordpress.git] / wp-includes / class-simplepie.php

diff --git a/wp-includes/class-simplepie.php b/wp-includes/class-simplepie.php
index 45c33c86e27ba02a8ccf0f5f3dc2fbc1069783fa..275033a822919fd101de6426664ba48671e4c59c 100644 (file)
--- a/wp-includes/class-simplepie.php
+++ b/wp-includes/class-simplepie.php
@@ -1,4 +1,5 @@
 <?php
+if ( !class_exists( 'SimplePie' ) ) :
 /**
  * SimplePie
  *
@@ -1830,7 +1831,7 @@ class SimplePie
        }
 
        /**
-        * Return the error message for the occured error
+        * Return the error message for the occurred error
         *
         * @access public
         * @return string Error message
@@ -4066,16 +4067,16 @@ class SimplePie_Item
                                        $temp = explode(':', $this->sanitize($duration_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
                                        if (sizeof($temp) > 0)
                                        {
-                                               (int) $seconds = array_pop($temp);
+                                               $seconds = (int) array_pop($temp);
                                        }
                                        if (sizeof($temp) > 0)
                                        {
-                                               (int) $minutes = array_pop($temp);
+                                               $minutes = (int) array_pop($temp);
                                                $seconds += $minutes * 60;
                                        }
                                        if (sizeof($temp) > 0)
                                        {
-                                               (int) $hours = array_pop($temp);
+                                               $hours = (int) array_pop($temp);
                                                $seconds += $hours * 3600;
                                        }
                                        unset($temp);
@@ -9426,7 +9427,7 @@ class SimplePie_Misc
                }
 
                // 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);
                }
@@ -14997,5 +14998,5 @@ class SimplePie_Sanitize
                }
        }
 }
-
+endif;
 ?>