diff options
| author | 2014-09-30 16:31:38 +0200 | |
|---|---|---|
| committer | 2014-09-30 16:31:38 +0200 | |
| commit | 13fb1170c06bd67ba69534e823ea6f5861c745dd (patch) | |
| tree | 11bcd4f537b860cf46f8a7d601f1925f12334e22 /app/Controllers/configureController.php | |
| parent | b9ddffdade8f6b8ba32684ca7eb640338074e61b (diff) | |
Move deletion of categories into new Controller
Fix i18n (occured -> occurred)
See https://github.com/marienfressinaud/FreshRSS/issues/646
Diffstat (limited to 'app/Controllers/configureController.php')
| -rwxr-xr-x | app/Controllers/configureController.php | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index 7ef144090..a7def6d9a 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -53,13 +53,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController { 'name' => $cat->name(), ); $catDAO->updateCategory($ids[$key], $values); - } elseif ($ids[$key] != $defaultId) { - $feedDAO->changeCategory($ids[$key], $defaultId); - $catDAO->deleteCategory($ids[$key]); - - // Remove related queries. - $this->view->conf->remove_query_by_get('c_' . $ids[$key]); - $this->view->conf->save(); } } |
