update picofeed

5 files changed, 25 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12adee1a7..1974e93bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ owncloud-news (7.0.0)
 * **Backwards incompatible change**: Remove console commands and instead run them after specific updates
 * **Bugfix**: Fix bug that prevented non admin users from changing feed parameters
 * **Enhancement**: If a feed failed to update more than 100 times, show a hint in the web interface
+* **Enhancement**: Overwrite active feed styling to make it look like in ownCloud 8.1
 
 owncloud-news (6.1.1)
 * **Security**: Update picoFeed to add an [XXE fix for php-fpm](http://framework.zend.com/security/advisory/ZF2015-06) on systems with PHP <5.5.22 or >5.6 and <5.6.6. This issue allows any user with access to the News app to read abitrary files from the server. For more information read up on the [Zend advisory](http://framework.zend.com/security/advisory/ZF2015-06) and the [OWASP page](https://www.owasp.org/index.php/XML_External_Entity_%28XXE%29_Processing). Affected supported distributions include [Ubuntu 14.04](https://bugs.launchpad.net/ubuntu/trusty/+source/php5/+bug/1509817)
diff --git a/composer.lock b/composer.lock
index 1e1a7e9f1..b3552cf30 100644
--- a/composer.lock
+++ b/composer.lock
@@ -57,12 +57,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/fguillot/picoFeed.git",
-                "reference": "04cc8d395e626d7d75388d904afa1112f61c23b7"
+                "reference": "0551e86dbaa77b997d08df9c3fc456875df6efa0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/04cc8d395e626d7d75388d904afa1112f61c23b7",
-                "reference": "04cc8d395e626d7d75388d904afa1112f61c23b7",
+                "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/0551e86dbaa77b997d08df9c3fc456875df6efa0",
+                "reference": "0551e86dbaa77b997d08df9c3fc456875df6efa0",
                 "shasum": ""
             },
             "require": {
@@ -97,7 +97,7 @@
             ],
             "description": "Modern library to handle RSS/Atom feeds",
             "homepage": "https://github.com/fguillot/picoFeed",
-            "time": "2016-01-03 02:14:59"
+            "time": "2016-01-08 20:39:51"
         },
         {
             "name": "pear/net_url2",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 86f3be720..17aa54be6 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -209,12 +209,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/fguillot/picoFeed.git",
-            "reference": "04cc8d395e626d7d75388d904afa1112f61c23b7"
+            "reference": "0551e86dbaa77b997d08df9c3fc456875df6efa0"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/04cc8d395e626d7d75388d904afa1112f61c23b7",
-            "reference": "04cc8d395e626d7d75388d904afa1112f61c23b7",
+            "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/0551e86dbaa77b997d08df9c3fc456875df6efa0",
+            "reference": "0551e86dbaa77b997d08df9c3fc456875df6efa0",
             "shasum": ""
         },
         "require": {
@@ -229,7 +229,7 @@
         "suggest": {
             "ext-curl": "PicoFeed will use cURL if present"
         },
-        "time": "2016-01-03 02:14:59",
+        "time": "2016-01-08 20:39:51",
         "bin": [
             "picofeed"
         ],
diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php
index cab74b6aa..53c5cf7a4 100644
--- a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php
@@ -30,6 +30,7 @@ class Favicon
         'image/x-icon',
         'image/jpeg',
         'image/jpg',
+        'image/svg+xml'
     );
 
     /**
@@ -195,7 +196,7 @@ class Favicon
         $dom = XmlParser::getHtmlDocument($html);
 
         $xpath = new DOMXpath($dom);
-        $elements = $xpath->query("//link[contains(@rel, 'icon') and not(contains(@rel, 'apple'))]");
+        $elements = $xpath->query('//link[@rel="icon" or @rel="shortcut icon" or @rel="icon shortcut"]');
 
         for ($i = 0; $i < $elements->length; ++$i) {
             $icons[] = $elements->item($i)->getAttribute('href');
diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.franceculture.fr.php b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.franceculture.fr.php
new file mode 100644
index 000000000..b56a29b51
--- /dev/null
+++ b/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.franceculture.fr.php
@@ -0,0 +1,14 @@
+<?php
+return array(
+    'grabber' => array(
+        '%.*%' => array(
+            'test_url' => 'http://www.franceculture.fr/emission-culture-eco-la-finance-aime-toujours-la-france-2016-01-08',
+            'body' => array(
+                '//div[@class="listen"]',
+                '//div[@class="field-items"]',
+            ),
+            'strip' => array(
+            ),
+        )
+    )
+);