aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/Controllers/tagController.php15
1 files changed, 11 insertions, 4 deletions
diff --git a/app/Controllers/tagController.php b/app/Controllers/tagController.php
index da7e0c2da..47301bba0 100644
--- a/app/Controllers/tagController.php
+++ b/app/Controllers/tagController.php
@@ -153,14 +153,21 @@ class FreshRSS_tag_Controller extends FreshRSS_ActionController {
Minz_Error::error(405);
}
+ $url_redirect = ['c' => 'tag', 'a' => 'index'];
$name = Minz_Request::paramString('name');
+
+ $catDAO = FreshRSS_Factory::createCategoryDao();
+ if ($catDAO->searchByName($name) !== null) {
+ Minz_Request::bad(_t('feedback.sub.category.name_exists'), $url_redirect);
+ }
+
$tagDAO = FreshRSS_Factory::createTagDao();
- if (strlen($name) > 0 && null === $tagDAO->searchByName($name)) {
- $tagDAO->addTag(['name' => $name]);
- Minz_Request::good(_t('feedback.tag.created', $name), ['c' => 'tag', 'a' => 'index']);
+ if ($tagDAO->searchByName($name) !== null) {
+ Minz_Request::bad(_t('feedback.tag.name_exists', $name), $url_redirect);
}
- Minz_Request::bad(_t('feedback.tag.name_exists', $name), ['c' => 'tag', 'a' => 'index']);
+ $tagDAO->addTag(['name' => $name]);
+ Minz_Request::good(_t('feedback.tag.created', $name), $url_redirect);
}
/**