aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2008-09-02 13:27:37 +0000
committerChris Smith <toonarmy@phpbb.com>2008-09-02 13:27:37 +0000
commite81eb70aedd6105904854a5ce2233f4fe14eae80 (patch)
tree65d26460756e39ec3d90e61cab7b7b1ec9c98f1e /phpBB/includes
parent80b7806f67e3856fb24deaa583e185a98ee52028 (diff)
downloadforums-e81eb70aedd6105904854a5ce2233f4fe14eae80.tar
forums-e81eb70aedd6105904854a5ce2233f4fe14eae80.tar.gz
forums-e81eb70aedd6105904854a5ce2233f4fe14eae80.tar.bz2
forums-e81eb70aedd6105904854a5ce2233f4fe14eae80.tar.xz
forums-e81eb70aedd6105904854a5ce2233f4fe14eae80.zip
Refine fix for #31445 originally committed in r8758
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8809 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/db/firebird.php2
-rw-r--r--phpBB/includes/db/mssql.php2
-rw-r--r--phpBB/includes/db/mssql_odbc.php2
-rw-r--r--phpBB/includes/db/mysql.php2
-rw-r--r--phpBB/includes/db/mysqli.php2
-rw-r--r--phpBB/includes/db/oracle.php2
-rw-r--r--phpBB/includes/db/postgres.php2
-rw-r--r--phpBB/includes/db/sqlite.php2
8 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 4382d891d0..6765f2af48 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -238,7 +238,7 @@ class dbal_firebird extends dbal
return false;
}
- return ($this->query_result !== false) ? $this->query_result : false;
+ return $this->query_result;
}
/**
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index 79586c343d..8b67f04b5d 100644
--- a/phpBB/includes/db/mssql.php
+++ b/phpBB/includes/db/mssql.php
@@ -162,7 +162,7 @@ class dbal_mssql extends dbal
return false;
}
- return ($this->query_result !== false) ? $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 30660a2652..bc02971b8d 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -174,7 +174,7 @@ class dbal_mssql_odbc extends dbal
return false;
}
- return ($this->query_result !== false) ? $this->query_result : false;
+ return $this->query_result;
}
/**
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 5c8d08b19d..edeaf7aa73 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -183,7 +183,7 @@ class dbal_mysql extends dbal
return false;
}
- return ($this->query_result !== false) ? $this->query_result : false;
+ return $this->query_result;
}
/**
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 6041320c7e..e8fd35f859 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -163,7 +163,7 @@ class dbal_mysqli extends dbal
return false;
}
- return ($this->query_result !== false) ? $this->query_result : false;
+ return $this->query_result;
}
/**
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index d31803dad2..582b267ac3 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -355,7 +355,7 @@ class dbal_oracle extends dbal
return false;
}
- return ($this->query_result !== false) ? $this->query_result : false;
+ return $this->query_result;
}
/**
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index b214533f9d..d6dddb5996 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -202,7 +202,7 @@ class dbal_postgres extends dbal
return false;
}
- return ($this->query_result !== false) ? $this->query_result : false;
+ return $this->query_result;
}
/**
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index 3acb777c82..fae9ba3f92 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -135,7 +135,7 @@ class dbal_sqlite extends dbal
return false;
}
- return ($this->query_result !== false) ? $this->query_result : false;
+ return $this->query_result;
}
/**