Procházet zdrojové kódy

Should fix certain feeds in RSS which are not following one of RFC822/RFC2822 for dates (reported by Kawsar Saiyeed)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@16824 44c647ce-9c0f-0410-b52a-842ac1e357ba
padraic před 16 roky
rodič
revize
96e5fa7c0d

+ 9 - 5
library/Zend/Feed/Reader/Entry/Rss.php

@@ -303,11 +303,15 @@ class Zend_Feed_Reader_Entry_Rss extends Zend_Feed_Reader_Entry_EntryAbstract im
                     try {
                         $date->set($dateModified, Zend_Date::RFC_2822);
                     } catch (Zend_Date_Exception $e) {
-                        require_once 'Zend/Feed/Exception.php';
-                        throw new Zend_Feed_Exception(
-                            'Could not load date due to unrecognised format (should follow RFC 822 or 2822): '
-                            . $e->getMessage()
-                        );
+                        try {
+                            $date->set($dateModified, Zend_Date::DATES);
+                        } catch (Zend_Date_Exception $e) {
+                            require_once 'Zend/Feed/Exception.php';
+                            throw new Zend_Feed_Exception(
+                                'Could not load date due to unrecognised format (should follow RFC 822 or 2822): '
+                                . $e->getMessage()
+                            );
+                        }
                     }
                 }
             }

+ 10 - 5
library/Zend/Feed/Reader/Feed/Rss.php

@@ -223,11 +223,16 @@ class Zend_Feed_Reader_Feed_Rss extends Zend_Feed_Reader_Feed_FeedAbstract
                     try {
                         $date->set($dateModified, Zend_Date::RFC_2822);
                     } catch (Zend_Date_Exception $e) {
-                        require_once 'Zend/Feed/Exception.php';
-                        throw new Zend_Feed_Exception(
-                        'Could not load date due to unrecognised format (should follow RFC 822 or 2822): '
-                        .$e->getMessage()
-                        );
+                        try {
+                            $date->set($dateModified, Zend_Date::DATES);
+                        } catch (Zend_Date_Exception $e) {
+                            require_once 'Zend/Feed/Exception.php';
+                            throw new Zend_Feed_Exception(
+                                'Could not load date due to unrecognised format (should follow RFC 822 or 2822): '
+                                . $e->getMessage()
+                            );
+                        }
+                    }
                     }
                 }
             }