correct te last merge

Dolphiq · Oct 22, 2017 · 83de725 · 83de725
1 parent 2a8ff7f
commit 83de725
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Redirect Changelog
+## 1.0.7 - 2017-10-22
+
+### Fixed
+- The branch was not merged correctly last build, we fixed it.
+
 ## 1.0.6 - 2017-10-19
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "dolphiq/redirect",
-    "description": "Redirect plugin for Craft3 CMS",
+    "description": "Craft redirect plugin provides an easy way to enter and maintain 301 and 302 redirects.",
     "type": "craft-plugin",
     "version": "1.0.6",
     "keywords": [
@@ -29,12 +29,12 @@
         }
     },
     "extra": {
-        "name": "Redirect",
+        "name": "Redirect plugin for Craft 3",
         "handle": "redirect",
         "schemaVersion": "1.0.3",
         "developer": "Dolphiq",
         "developerUrl": "https://dolphiq.nl/",
-        "description": "Redirect plugin for Craft3 CMS",
+        "description": "Craft redirect plugin provides an easy way to enter and maintain 301 and 302 redirects.",
         "hasCpSettings": true,
         "hasCpSection": true,
         "documentationUrl": "https://github.com/Dolphiq/craft3-plugin-redirect/blob/master/README.md",

diff --git a/src/elements/Redirect.php b/src/elements/Redirect.php
@@ -342,7 +342,11 @@ public function afterSave(bool $isNew)
 
         // remove form other sites
         Craft::$app->getDb()->createCommand()
-            ->delete('{{%elements_sites}}', '"elementId" = :elementId AND "siteId" != :siteId', [':elementId' => $record->id, ':siteId' => $this->siteId])
+            ->delete('{{%elements_sites}}', [
+                'AND',
+                ['elementId' => $record->id],
+                ['!=', 'siteId', $this->siteId]
+            ])
             ->execute();
         parent::afterSave($isNew);
     }