diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-06-19 22:40:21 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-06-19 22:43:29 +0100 |
| commit | c5bce69901490d0d5129c30a1b80e9b7409700e6 (patch) | |
| tree | 788c5c9c8262a175e5880430f3c5662d8882be15 /app/Controller | |
| parent | 7ea254c8f6001c55fe592464de2a388a122968eb (diff) | |
| download | webtrees-c5bce69901490d0d5129c30a1b80e9b7409700e6.tar.gz webtrees-c5bce69901490d0d5129c30a1b80e9b7409700e6.tar.bz2 webtrees-c5bce69901490d0d5129c30a1b80e9b7409700e6.zip | |
Strict typing
Diffstat (limited to 'app/Controller')
| -rw-r--r-- | app/Controller/AdvancedSearchController.php | 16 | ||||
| -rw-r--r-- | app/Controller/BranchesController.php | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app/Controller/AdvancedSearchController.php b/app/Controller/AdvancedSearchController.php index a3fbd6db3b..98ad882e96 100644 --- a/app/Controller/AdvancedSearchController.php +++ b/app/Controller/AdvancedSearchController.php @@ -392,7 +392,7 @@ class AdvancedSearchController extends SearchController { break; case 'SDX_STD': $sdx = Soundex::russell($value); - if ($sdx) { + if ($sdx !== null) { $sdx = explode(':', $sdx); foreach ($sdx as $k => $v) { $sdx[$k] = "i_n.n_soundex_givn_std LIKE CONCAT('%', ?, '%')"; @@ -408,7 +408,7 @@ class AdvancedSearchController extends SearchController { case 'SDX': // SDX uses DM by default. case 'SDX_DM': $sdx = Soundex::daitchMokotoff($value); - if ($sdx) { + if ($sdx !== null) { $sdx = explode(':', $sdx); foreach ($sdx as $k => $v) { $sdx[$k] = "i_n.n_soundex_givn_dm LIKE CONCAT('%', ?, '%')"; @@ -439,7 +439,7 @@ class AdvancedSearchController extends SearchController { break; case 'SDX_STD': $sdx = Soundex::russell($value); - if ($sdx) { + if ($sdx !== null) { $sdx = explode(':', $sdx); foreach ($sdx as $k => $v) { $sdx[$k] = "i_n.n_soundex_surn_std LIKE CONCAT('%', ?, '%')"; @@ -455,7 +455,7 @@ class AdvancedSearchController extends SearchController { case 'SDX': // SDX uses DM by default. case 'SDX_DM': $sdx = Soundex::daitchMokotoff($value); - if ($sdx) { + if ($sdx !== null) { $sdx = explode(':', $sdx); foreach ($sdx as $k => $v) { $sdx[$k] = "i_n.n_soundex_surn_dm LIKE CONCAT('%', ?, '%')"; @@ -541,7 +541,7 @@ class AdvancedSearchController extends SearchController { break; case 'SDX_STD': $sdx = Soundex::russell($value); - if ($sdx) { + if ($sdx !== null) { $sdx = explode(':', $sdx); foreach ($sdx as $k => $v) { $sdx[$k] = "{$table}.n_soundex_givn_std LIKE CONCAT('%', ?, '%')"; @@ -557,7 +557,7 @@ class AdvancedSearchController extends SearchController { case 'SDX': // SDX uses DM by default. case 'SDX_DM': $sdx = Soundex::daitchMokotoff($value); - if ($sdx) { + if ($sdx !== null) { $sdx = explode(':', $sdx); foreach ($sdx as $k => $v) { $sdx[$k] = "{$table}.n_soundex_givn_dm LIKE CONCAT('%', ?, '%')"; @@ -588,7 +588,7 @@ class AdvancedSearchController extends SearchController { break; case 'SDX_STD': $sdx = Soundex::russell($value); - if ($sdx) { + if ($sdx !== null) { $sdx = explode(':', $sdx); foreach ($sdx as $k => $v) { $sdx[$k] = "{$table}.n_soundex_surn_std LIKE CONCAT('%', ?, '%')"; @@ -604,7 +604,7 @@ class AdvancedSearchController extends SearchController { case 'SDX': // SDX uses DM by default. case 'SDX_DM': $sdx = Soundex::daitchMokotoff($value); - if ($sdx) { + if ($sdx !== null) { $sdx = explode(':', $sdx); foreach ($sdx as $k => $v) { $sdx[$k] = "{$table}.n_soundex_surn_dm LIKE CONCAT('%', ?, '%')"; diff --git a/app/Controller/BranchesController.php b/app/Controller/BranchesController.php index ccd6215c5f..1e5609b54f 100644 --- a/app/Controller/BranchesController.php +++ b/app/Controller/BranchesController.php @@ -112,7 +112,7 @@ class BranchesController extends PageController { $args = array($WT_TREE->getTreeId(), '_MARNM', $this->surname, $this->surname); if ($this->soundex_std) { $sdx = Soundex::russell($this->surname); - if ($sdx) { + if ($sdx !== null) { foreach (explode(':', $sdx) as $value) { $sql .= " OR n_soundex_surn_std LIKE CONCAT('%', ?, '%')"; $args[] = $value; @@ -121,7 +121,7 @@ class BranchesController extends PageController { } if ($this->soundex_dm) { $sdx = Soundex::daitchMokotoff($this->surname); - if ($sdx) { + if ($sdx !== null) { foreach (explode(':', $sdx) as $value) { $sql .= " OR n_soundex_surn_dm LIKE CONCAT('%', ?, '%')"; $args[] = $value; |