From fda7add88760948fb92ada9f7f63eee2b823f70b Mon Sep 17 00:00:00 2001 From: markjcrane Date: Wed, 8 Jul 2015 09:30:00 -0300 Subject: [PATCH] Remove trailing spaces and adjust the vertical spacing. --- app/vars/app_defaults.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php index 2200587635..96309fd365 100644 --- a/app/vars/app_defaults.php +++ b/app/vars/app_defaults.php @@ -80,7 +80,7 @@ EOD; $country_list = <<prepare(check_sql($sql)); if ($prep_statement) { $prep_statement->execute(); - $result = $prep_statement->fetchAll(PDO::FETCH_ASSOC); - if ( count($result)> 0) { $country_iso = $result[0]["value"]; } } - unset($prep_statement, $sql, $result); - if ( $country_iso===NULL ) + if ( $country_iso===NULL ) { return; + } $countries = json_decode($country_list, true); @@ -380,7 +378,7 @@ EOD; $sql .= ");"; $db->exec(check_sql($sql)); unset($sql, $row); - $x++; + $x++; } } unset($prep_statement, $sql); @@ -393,7 +391,6 @@ EOD; if ($prep_statement) { $prep_statement->execute(); $row = $prep_statement->fetch(PDO::FETCH_ASSOC); - if ($row['num_rows'] == 0) { $sql = "insert into v_vars "; $sql .= "("; @@ -417,7 +414,7 @@ EOD; $sql .= ");"; $db->exec(check_sql($sql)); unset($sql, $row); - $x++; + $x++; } } unset($prep_statement, $sql); @@ -430,7 +427,6 @@ EOD; if ($prep_statement) { $prep_statement->execute(); $row = $prep_statement->fetch(PDO::FETCH_ASSOC); - if ($row['num_rows'] == 0) { $sql = "insert into v_vars "; $sql .= "("; @@ -459,7 +455,7 @@ EOD; } unset($prep_statement, $sql); - unset($countries); + unset($countries); } } @@ -559,7 +555,7 @@ EOD; } } -//set country code variables + //set country code variables set_country_vars($db, $x); //save the vars.xml file