From 62e5648175218cbc53e854a8341fbb8dd6ee7d3c Mon Sep 17 00:00:00 2001 From: tomaszdurka Date: Wed, 29 Oct 2014 11:07:32 +0100 Subject: [PATCH 1/2] Delete languageKey only if it exists --- library/CM/Model/LanguageKey.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/CM/Model/LanguageKey.php b/library/CM/Model/LanguageKey.php index 767d01f49..f12d1bfe2 100644 --- 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() { From c98e96d189e2bfb28786b72218a3b85bcf85a417 Mon Sep 17 00:00:00 2001 From: tomaszdurka Date: Wed, 29 Oct 2014 11:17:41 +0100 Subject: [PATCH 2/2] Try to delete LanguageKey when it does not exist --- tests/library/CM/Model/LanguageKeyTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/library/CM/Model/LanguageKeyTest.php b/tests/library/CM/Model/LanguageKeyTest.php index d6e2343a3..cc5c22698 100644 --- 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() {