aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers
diff options
context:
space:
mode:
Diffstat (limited to 'app/Controllers')
-rw-r--r--app/Controllers/categoryController.php4
-rw-r--r--app/Controllers/subscriptionController.php1
2 files changed, 5 insertions, 0 deletions
diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 2c99751a4..c79f37fa4 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -123,6 +123,10 @@ class FreshRSS_category_Controller extends Minz_ActionController {
Minz_Request::bad(_t('category_no_id'), $url_redirect);
}
+ if ($id === $default_category->id()) {
+ Minz_Request::bad(_t('category_not_delete_default'), $url_redirect);
+ }
+
if ($feedDAO->changeCategory($id, $default_category->id()) === false) {
Minz_Request::bad(_t('error_occurred'), $url_redirect);
}
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index 83f803edb..aabae7b8f 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -19,6 +19,7 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
$catDAO = new FreshRSS_CategoryDAO();
+ $catDAO->checkDefault();
$this->view->categories = $catDAO->listCategories(false);
$this->view->default_category = $catDAO->getDefault();
}