diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-09-02 13:36:48 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-09-02 13:36:48 +0000 |
| commit | f2abefeaed267a405ae1ccafba7ce2a52794fadc (patch) | |
| tree | 41e34e0f0a1dedda5073f8d8cc854b942e080a3f | |
| parent | 57ec5805df1d396a52d1431903c8174fdb7569ad (diff) | |
| download | forums-f2abefeaed267a405ae1ccafba7ce2a52794fadc.tar forums-f2abefeaed267a405ae1ccafba7ce2a52794fadc.tar.gz forums-f2abefeaed267a405ae1ccafba7ce2a52794fadc.tar.bz2 forums-f2abefeaed267a405ae1ccafba7ce2a52794fadc.tar.xz forums-f2abefeaed267a405ae1ccafba7ce2a52794fadc.zip | |
Merge in r8758, r8807, r8808, r8809
git-svn-id: file:///svn/phpbb/trunk@8810 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/db/firebird.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/mssql.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/mssql_odbc.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/mysql.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/mysqli.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/oracle.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/postgres.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/sqlite.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php index 7760666ea1..429c0f2d4f 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/firebird.php @@ -215,7 +215,7 @@ class dbal_firebird extends dbal return false; } - return ($this->query_result) ? $this->query_result : false; + return $this->query_result; } /** diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php index f842cb06d6..a2081891e4 100644 --- a/phpBB/includes/db/mssql.php +++ b/phpBB/includes/db/mssql.php @@ -157,7 +157,7 @@ class dbal_mssql extends dbal return false; } - return ($this->query_result) ? $this->query_result : false; + return $this->query_result; } /** diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php index 86faf82036..b2e6c8d583 100644 --- a/phpBB/includes/db/mssql_odbc.php +++ b/phpBB/includes/db/mssql_odbc.php @@ -173,7 +173,7 @@ class dbal_mssql_odbc extends dbal return false; } - return ($this->query_result) ? $this->query_result : false; + return $this->query_result; } /** diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php index fd4dc74674..540009cc6c 100644 --- a/phpBB/includes/db/mysql.php +++ b/phpBB/includes/db/mysql.php @@ -173,7 +173,7 @@ class dbal_mysql extends dbal return false; } - return ($this->query_result) ? $this->query_result : false; + return $this->query_result; } /** diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php index a7ba07b8a5..ff77299b46 100644 --- a/phpBB/includes/db/mysqli.php +++ b/phpBB/includes/db/mysqli.php @@ -169,7 +169,7 @@ class dbal_mysqli extends dbal return false; } - return ($this->query_result) ? $this->query_result : false; + return $this->query_result; } /** diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index a66dfcce8b..411c2aa494 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -357,7 +357,7 @@ class dbal_oracle extends dbal return false; } - return ($this->query_result) ? $this->query_result : false; + return $this->query_result; } /** diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php index 4c3e4729fa..8ac0fa8300 100644 --- a/phpBB/includes/db/postgres.php +++ b/phpBB/includes/db/postgres.php @@ -198,7 +198,7 @@ class dbal_postgres extends dbal return false; } - return ($this->query_result) ? $this->query_result : false; + return $this->query_result; } /** diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php index f887e4e3b1..df1180db8f 100644 --- a/phpBB/includes/db/sqlite.php +++ b/phpBB/includes/db/sqlite.php @@ -143,7 +143,7 @@ class dbal_sqlite extends dbal return false; } - return ($this->query_result) ? $this->query_result : false; + return $this->query_result; } /** diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index fae48b84fa..782293294e 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -418,7 +418,7 @@ class ucp_profile $now = getdate(); $s_birthday_year_options = '<option value="0"' . ((!$data['bday_year']) ? ' selected="selected"' : '') . '>--</option>'; - for ($i = $now['year'] - 100; $i < $now['year']; $i++) + for ($i = $now['year'] - 100; $i <= $now['year']; $i++) { $selected = ($i == $data['bday_year']) ? ' selected="selected"' : ''; $s_birthday_year_options .= "<option value=\"$i\"$selected>$i</option>"; |