Merge pull request #1445 from tomaszdurka/issue-1445

Delete languageKey only if exists
cargomedia · Oct 29, 2014 · ec53c23 · ec53c23
2 parents dc4ef70 + c98e96d
commit ec53c23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/library/CM/Model/LanguageKey.php b/library/CM/Model/LanguageKey.php
@@ -178,7 +178,9 @@ public static function exists($name) {
      */
     public static function deleteByName($name) {
         $languageKey = self::findByName($name);
-        $languageKey->delete();
+        if ($languageKey) {
+            $languageKey->delete();
+        }
     }
 
     public static function getPersistenceClass() {

diff --git a/tests/library/CM/Model/LanguageKeyTest.php b/tests/library/CM/Model/LanguageKeyTest.php
@@ -95,6 +95,7 @@ public function testDeleteByName() {
         $this->assertTrue(CM_Model_LanguageKey::exists('foo'));
         CM_Model_LanguageKey::deleteByName('foo');
         $this->assertFalse(CM_Model_LanguageKey::exists('foo'));
+        CM_Model_LanguageKey::deleteByName('foo');
     }
 
     public function testIncreaseUpdateCountNewDeploy() {