summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ajax/createfeed.php3
-rw-r--r--js/news.js8
2 files changed, 1 insertions, 10 deletions
diff --git a/ajax/createfeed.php b/ajax/createfeed.php
index db02a1723..884958b08 100644
--- a/ajax/createfeed.php
+++ b/ajax/createfeed.php
@@ -46,8 +46,7 @@ if ($feedid == null) {
if ($feed != null) {
$feedid = $feedmapper->save($feed, $folderid);
}
-}
-else {
+} else {
OCP\JSON::error(array('data' => array('message' => $l->t('Feed already exists.'))));
OCP\Util::writeLog('news','ajax/createfeed.php: Error adding feed: '.$_POST['feedurl'], OCP\Util::ERROR);
exit();
diff --git a/js/news.js b/js/news.js
index a589ee644..1aa6fd37d 100644
--- a/js/news.js
+++ b/js/news.js
@@ -152,14 +152,6 @@ News={
$("#feed_add_url").val('');
$(button).attr("disabled", false);
$(button).prop('value', t('news', 'Add feed'));
- },
- statusCode: {
- 500: function() {
- OC.dialogs.alert(t('news', 'Error while parsing the feed'), t('news', 'Fatal Error'));
- $("#feed_add_url").val('');
- $(button).attr("disabled", false);
- $(button).prop('value', t('news', 'Add feed'));
- }
}
});