summaryrefslogtreecommitdiffstats
path: root/utility
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-02 12:04:45 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-02 12:04:45 +0200
commitc795c0aa10f7d404a96ac893d3ba2972724d8511 (patch)
tree56b8a9bc27379ac0fb28d21abd831acf8eaef13f /utility
parentbd7d13ce963f286459684934257a6a1e61d7bfc7 (diff)
fix #11 by not relying on db exceptions anymore since there is no fking proper exception handling in the owncloud db code and stuff will break. instead update when item has been found and if not insert
Diffstat (limited to 'utility')
-rw-r--r--utility/feedfetcher.php4
-rw-r--r--utility/ifeedfetcher.php2
2 files changed, 4 insertions, 2 deletions
diff --git a/utility/feedfetcher.php b/utility/feedfetcher.php
index bf8cbd35b..54c416d71 100644
--- a/utility/feedfetcher.php
+++ b/utility/feedfetcher.php
@@ -125,7 +125,7 @@ class FeedFetcher implements IFeedFetcher {
}
- public function checkFavicon($favicon) {
+ private function checkFavicon($favicon) {
if ($favicon === null || $favicon == false)
return false;
@@ -146,7 +146,7 @@ class FeedFetcher implements IFeedFetcher {
}
- public function discoverFavicon($url) {
+ private function discoverFavicon($url) {
//try webroot favicon
$favicon = \SimplePie_Misc::absolutize_url('/favicon.ico', $url);
diff --git a/utility/ifeedfetcher.php b/utility/ifeedfetcher.php
index 765a8e91f..2bf663c0f 100644
--- a/utility/ifeedfetcher.php
+++ b/utility/ifeedfetcher.php
@@ -30,6 +30,7 @@ interface IFeedFetcher {
/**
* @param string url the url that the user entered in the add feed dialog
* box
+ * @throws FetcherException if the fetcher encounters a problem
* @return array with the first element being the feed and the
* second element being an array of items. Those items will be saved into
* into the database
@@ -42,4 +43,5 @@ interface IFeedFetcher {
* used exclusively to fetch the feed and the items of the page
*/
function canHandle($url);
+
} \ No newline at end of file