summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2014-08-27 11:07:01 +0100
committerGreg Roach <fisharebest@gmail.com>2014-08-27 11:07:01 +0100
commitaea371e670129135b9792665c1ee02631a3c76c8 (patch)
treee510b49493f3c134dbfef4ef4d3ca9d0dffe9620 /includes
parentb877085fb791e9b80dfc0617a59099a0a01f5b43 (diff)
downloadwebtrees-aea371e670129135b9792665c1ee02631a3c76c8.tar.gz
webtrees-aea371e670129135b9792665c1ee02631a3c76c8.tar.bz2
webtrees-aea371e670129135b9792665c1ee02631a3c76c8.zip
Coding style - prefer &&/|| to and/or
Diffstat (limited to 'includes')
-rw-r--r--includes/functions/functions_edit.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php
index bee6d37fbf..f1d0b37cae 100644
--- a/includes/functions/functions_edit.php
+++ b/includes/functions/functions_edit.php
@@ -478,7 +478,7 @@ function add_simple_tag(
}
// tag level
if ($level>0) {
- if ($fact=="TEXT" and $level>1) {
+ if ($fact=='TEXT' && $level>1) {
echo "<input type=\"hidden\" name=\"glevels[]\" value=\"", $level-1, "\">";
echo "<input type=\"hidden\" name=\"islink[]\" value=\"0\">";
echo "<input type=\"hidden\" name=\"tag[]\" value=\"DATA\">";
@@ -655,7 +655,9 @@ function add_simple_tag(
else echo "<option value=\"", $key, "\"";
$a=strtolower($key);
$b=strtolower($value);
- if (@strpos($a, $b)!==false or @strpos($b, $a)!==false) echo " selected=\"selected\"";
+ if (@strpos($a, $b) !== false || @strpos($b, $a) !== false) {
+ echo ' selected="selected"';
+ }
$tmp="MARR_".strtoupper($key);
echo ">", WT_Gedcom_Tag::getLabel($tmp), "</option>";
}