aboutsummaryrefslogtreecommitdiff
path: root/lib/lib_rss.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-04-17 19:33:02 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-04-17 19:33:02 +0200
commit592a34f0d21ff1b6d4bd8613052d2684df39d246 (patch)
tree6c93b180bf271e32357bf1bad4baa93aa1233f5b /lib/lib_rss.php
parent044908439bdd7280f7539e12441d7dfa6c4d4c63 (diff)
parenta2b5e8f3ce597fbcec0c25b68c551a526d2bf3ec (diff)
Merge branch 'dev' into releases
Diffstat (limited to 'lib/lib_rss.php')
-rw-r--r--lib/lib_rss.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index b9202755b..81a98590e 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -124,7 +124,11 @@ function opml_import ($xml) {
}
if ($title) {
- $cat = new Category ($title);
+ $catDAO = new CategoryDAO ();
+ $cat = $catDAO->searchByName ($title);
+ if ($cat === false) {
+ $cat = new Category ($title);
+ }
$categories[] = $cat;
$feeds = array_merge ($feeds, getFeedsOutline ($outline, $cat->id ()));