Merge pull request #7 from joomlatools/feature/6-delete

Fix deletion of tags without relations
joomlatools · Jul 13, 2016 · bfa165d · bfa165d
2 parents 8724e56 + 01e1806
commit bfa165d
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/model/entity/tag.php b/model/entity/tag.php
@@ -81,16 +81,14 @@ public function delete()
 
         $rowset = $table->select($query);
 
-        if($rowset->count())
-        {
-            //Delete the relations
-            if($result = $rowset->delete())
-            {
-                //Delete the tag
-                if(!$this->row) {
-                    $result = parent::delete();
-                }
-            }
+        //Delete the relations
+        if($rowset->count()) {
+            $result = $rowset->delete();
+        }
+
+        //Delete the tag
+        if(!$this->row) {
+            $result = parent::delete();
         }
 
         return $result;