Merge pull request #177 from catalyst/email-suffix

Make email suffix cleaner idempotent #176
catalyst · May 13, 2024 · 0b89660 · 0b89660
2 parents 05ef221 + d392456
commit 0b89660
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cleaner/email/classes/clean.php b/cleaner/email/classes/clean.php
@@ -111,9 +111,10 @@ public static function execute_appendsuffix($config, $verbose, $dryrun) {
         }
 
         $query  = "UPDATE {user} SET email = " . $DB->sql_concat_join("''", ['email', "'$suffix'"]);
+        $query .= " WHERE email " . $DB->sql_regex(false) . " '$suffix'";
 
         if (!empty($emailsuffixignore)) {
-            $query .= " WHERE email " . $DB->sql_regex(false) . " '$emailsuffixignore'";
+            $query .= " AND email " . $DB->sql_regex(false) . " '$emailsuffixignore'";
         }
 
         if ($verbose) {