summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-08-29 13:35:07 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-08-29 13:35:07 +0200
commit6f8d5a0830cffa771b1dafee5f3133bd6f01cb73 (patch)
tree95a5d8682d8839a6b784fc78d7862974553c6a26
parent4d7f53380d31154709faa3f9d6cdc467ff141951 (diff)
changelog improvements
-rw-r--r--CHANGELOG2
-rw-r--r--utility/articleenhancer/articleenhancer.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 51e95a352..1282c32af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
owncloud-news (1.401)
* Add possibility to hook up article enhancers which fetch article content directly from the web page
-* Add article enhancer for explosm.net to directly fetch comics
+* Add article enhancer for explosm.net to directly fetch comics and shorts
* Possible backwards incompatible change by using the link provided by simplepie instead of the user for the url hash. This prevents duplication of the feed when adding a slightly different feed url which points to the same feed and allows a speedup from O(n) to O(1) for article enhanchers
* Add an option route for the API which handles the CORS headers to allow webapplications to access the API
diff --git a/utility/articleenhancer/articleenhancer.php b/utility/articleenhancer/articleenhancer.php
index 7fc67c660..7565070f8 100644
--- a/utility/articleenhancer/articleenhancer.php
+++ b/utility/articleenhancer/articleenhancer.php
@@ -44,7 +44,7 @@ abstract class ArticleEnhancer {
* @param array $regexXPathPair an associative array containing regex to
* match the url and the xpath that should be used for it to extract the
* page
- * @param int $maximumTimeout maximum timeout in seconds
+ * @param int $maximumTimeout maximum timeout in seconds, defaults to 10 sec
*/
public function __construct($purifier, SimplePieFileFactory $fileFactory,
array $regexXPathPair, $maximumTimeout=10){