mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-29 02:34:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

API fix feed rename

Browse Source 
https://github.com/FreshRSS/FreshRSS/issues/1254

https://github.com/jangernert/FeedReader/issues/59#issuecomment-249558202
This commit is contained in:
Alexandre Alapetite
2016-09-26 15:20:02 +02:00
parent 273d28b763
commit d5ca360ca9
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/feedController.php
View File

@@ -474,7 +474,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
}
public static function moveFeed($feed_id, $cat_id, $new_cat_name = '') {
if ($feed_id <= 0) {
if ($feed_id <= 0 || ($cat_id <= 0 && $new_cat_name == '')) {
return false;
}

9
p/api/greader.php
View File

@@ -323,13 +323,10 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
}
}
$cat = $categoryDAO->searchByName($c_name);
$addCatId = $cat == null ? -1 : $cat->id();
$addCatId = $cat == null ? 0 : $cat->id();
} else if ($remove != '' && strpos($remove, 'user/-/label/')) {
$addCatId = 1; //Default category
}
if ($addCatId <= 0 && $c_name == '') {
$addCatId = 1; //Default category
}
$feedDAO = FreshRSS_Factory::createFeedDao();
for ($i = count($streamNames) - 1; $i >= 0; $i--) {
$streamName = $streamNames[$i]; //feed/http://example.net/sample.xml ; feed/338
@@ -366,7 +363,9 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
break;
case 'edit':
if ($feedId > 0) {
FreshRSS_feed_Controller::moveFeed($feedId, $addCatId, $c_name);
if ($addCatId > 0 || $c_name != '') {
FreshRSS_feed_Controller::moveFeed($feedId, $addCatId, $c_name);
}
if ($title != '') {
FreshRSS_feed_Controller::renameFeed($feedId, $title);
}