diff options
| author | Greg Roach <fisharebest@gmail.com> | 2016-01-17 18:19:16 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2016-01-17 18:19:16 +0000 |
| commit | 2bbb9086a2c520678f71cf71bbe85bde7c5b43d9 (patch) | |
| tree | af52a3de8c3adcae6c3bc43b2e126261974f3783 | |
| parent | ad2f0e13109a624a158c7532c312bc08f1d45af8 (diff) | |
| download | webtrees-2bbb9086a2c520678f71cf71bbe85bde7c5b43d9.tar.gz webtrees-2bbb9086a2c520678f71cf71bbe85bde7c5b43d9.tar.bz2 webtrees-2bbb9086a2c520678f71cf71bbe85bde7c5b43d9.zip | |
Fix #805 - search and replace containing regex characters
| -rw-r--r-- | app/Controller/SearchController.php | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/app/Controller/SearchController.php b/app/Controller/SearchController.php index 831a9bb636..181901df8b 100644 --- a/app/Controller/SearchController.php +++ b/app/Controller/SearchController.php @@ -311,6 +311,8 @@ class SearchController extends PageController { Log::addEditLog("Search And Replace old:" . $this->query . " new:" . $this->replace); + $query = preg_quote($this->query, '/'); + $adv_name_tags = preg_split("/[\s,;: ]+/", $tree->getPreference('ADVANCED_NAME_FACTS')); $name_tags = array_unique(array_merge(Config::standardNameFacts(), $adv_name_tags)); $name_tags[] = '_MARNM'; @@ -319,18 +321,18 @@ class SearchController extends PageController { $old_record = $record->getGedcom(); $new_record = $old_record; if ($this->replaceAll) { - $new_record = preg_replace("~" . $this->query . "~i", $this->replace, $new_record); + $new_record = preg_replace("/" . $query . "/i", $this->replace, $new_record); } else { if ($this->replaceNames) { foreach ($name_tags as $tag) { - $new_record = preg_replace("~(\d) " . $tag . " (.*)" . $this->query . "(.*)~i", "$1 " . $tag . " $2" . $this->replace . "$3", $new_record); + $new_record = preg_replace("/(\d) " . $tag . " (.*)" . $query . "(.*)/i", "$1 " . $tag . " $2" . $this->replace . "$3", $new_record); } } if ($this->replacePlaces) { if ($this->replacePlacesWord) { - $new_record = preg_replace('~(\d) PLAC (.*)([,\W\s])' . $this->query . '([,\W\s])~i', "$1 PLAC $2$3" . $this->replace . "$4", $new_record); + $new_record = preg_replace('/(\d) PLAC (.*)([,\W\s])' . $query . '([,\W\s])/i', "$1 PLAC $2$3" . $this->replace . "$4", $new_record); } else { - $new_record = preg_replace("~(\d) PLAC (.*)" . $this->query . "(.*)~i", "$1 PLAC $2" . $this->replace . "$3", $new_record); + $new_record = preg_replace("/(\d) PLAC (.*)" . $query . "(.*)/i", "$1 PLAC $2" . $this->replace . "$3", $new_record); } } } @@ -353,13 +355,13 @@ class SearchController extends PageController { $new_record = $old_record; if ($this->replaceAll) { - $new_record = preg_replace("~" . $this->query . "~i", $this->replace, $new_record); + $new_record = preg_replace("/" . $query . "/i", $this->replace, $new_record); } else { if ($this->replacePlaces) { if ($this->replacePlacesWord) { - $new_record = preg_replace('~(\d) PLAC (.*)([,\W\s])' . $this->query . '([,\W\s])~i', "$1 PLAC $2$3" . $this->replace . "$4", $new_record); + $new_record = preg_replace('/(\d) PLAC (.*)([,\W\s])' . $query . '([,\W\s])/i', "$1 PLAC $2$3" . $this->replace . "$4", $new_record); } else { - $new_record = preg_replace("~(\d) PLAC (.*)" . $this->query . "(.*)~i", "$1 PLAC $2" . $this->replace . "$3", $new_record); + $new_record = preg_replace("/(\d) PLAC (.*)" . $query . "(.*)/i", "$1 PLAC $2" . $this->replace . "$3", $new_record); } } } @@ -382,17 +384,17 @@ class SearchController extends PageController { $new_record = $old_record; if ($this->replaceAll) { - $new_record = preg_replace("~" . $this->query . "~i", $this->replace, $new_record); + $new_record = preg_replace("/" . $query . "/i", $this->replace, $new_record); } else { if ($this->replaceNames) { - $new_record = preg_replace("~(\d) TITL (.*)" . $this->query . "(.*)~i", "$1 TITL $2" . $this->replace . "$3", $new_record); - $new_record = preg_replace("~(\d) ABBR (.*)" . $this->query . "(.*)~i", "$1 ABBR $2" . $this->replace . "$3", $new_record); + $new_record = preg_replace("/(\d) TITL (.*)" . $query . "(.*)/i", "$1 TITL $2" . $this->replace . "$3", $new_record); + $new_record = preg_replace("/(\d) ABBR (.*)" . $query . "(.*)/i", "$1 ABBR $2" . $this->replace . "$3", $new_record); } if ($this->replacePlaces) { if ($this->replacePlacesWord) { - $new_record = preg_replace('~(\d) PLAC (.*)([,\W\s])' . $this->query . '([,\W\s])~i', "$1 PLAC $2$3" . $this->replace . "$4", $new_record); + $new_record = preg_replace('/(\d) PLAC (.*)([,\W\s])' . $query . '([,\W\s])/i', "$1 PLAC $2$3" . $this->replace . "$4", $new_record); } else { - $new_record = preg_replace("~(\d) PLAC (.*)" . $this->query . "(.*)~i", "$1 PLAC $2" . $this->replace . "$3", $new_record); + $new_record = preg_replace("/(\d) PLAC (.*)" . $query . "(.*)/i", "$1 PLAC $2" . $this->replace . "$3", $new_record); } } } @@ -415,7 +417,7 @@ class SearchController extends PageController { $new_record = $old_record; if ($this->replaceAll) { - $new_record = preg_replace("~" . $this->query . "~i", $this->replace, $new_record); + $new_record = preg_replace("/" . $query . "/i", $this->replace, $new_record); } //-- if the record changed replace the record otherwise remove it from the search results if ($new_record != $old_record) { |