aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-10-15 18:40:43 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-10-15 18:40:43 +0200
commit3521dfc2787a532365dba12eec669579d15d79f2 (patch)
tree9e606800cdde4e3051ed8eae0685afdc4b8c1929 /phpBB/phpbb
parent40932c26eaa7cddd0731b136a77c9bad704b69e0 (diff)
parenta35721f68c95153f46dd67ea465addedf82f538e (diff)
downloadforums-3521dfc2787a532365dba12eec669579d15d79f2.tar
forums-3521dfc2787a532365dba12eec669579d15d79f2.tar.gz
forums-3521dfc2787a532365dba12eec669579d15d79f2.tar.bz2
forums-3521dfc2787a532365dba12eec669579d15d79f2.tar.xz
forums-3521dfc2787a532365dba12eec669579d15d79f2.zip
Merge remote-tracking branch 'p/prep-release-3.1.0-a1' into develop
* p/prep-release-3.1.0-a1: [prep-release-3.1.0-a1] Update changelog with the latest changes [ticket/11919] Remove extra argument to notification manager's sql_fetchfield() [ticket/11918] Make sql_freeresult() consistent across all DB drivers [prep-release-3.1.0-a1] Only build packages for the latest olympus versions [prep-release-3.1.0-a1] Update changelog with 3.1.0-a1 changes [prep-release-3.1.0-a1] Update version to 3.1.0-a1
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/db/driver/firebird.php2
-rw-r--r--phpBB/phpbb/db/driver/mssql.php6
-rw-r--r--phpBB/phpbb/db/driver/mssql_odbc.php2
-rw-r--r--phpBB/phpbb/db/driver/mssqlnative.php3
-rw-r--r--phpBB/phpbb/db/driver/mysql.php2
-rw-r--r--phpBB/phpbb/db/driver/oracle.php2
-rw-r--r--phpBB/phpbb/db/driver/postgres.php2
-rw-r--r--phpBB/phpbb/db/driver/sqlite.php2
-rw-r--r--phpBB/phpbb/notification/manager.php4
9 files changed, 13 insertions, 12 deletions
diff --git a/phpBB/phpbb/db/driver/firebird.php b/phpBB/phpbb/db/driver/firebird.php
index 2df5eaf369..aef75eab15 100644
--- a/phpBB/phpbb/db/driver/firebird.php
+++ b/phpBB/phpbb/db/driver/firebird.php
@@ -398,7 +398,7 @@ class firebird extends \phpbb\db\driver\driver
$query_id = $this->query_result;
}
- if ($cache && $cache->sql_exists($query_id))
+ if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_freeresult($query_id);
}
diff --git a/phpBB/phpbb/db/driver/mssql.php b/phpBB/phpbb/db/driver/mssql.php
index 4d2cd287da..50096deded 100644
--- a/phpBB/phpbb/db/driver/mssql.php
+++ b/phpBB/phpbb/db/driver/mssql.php
@@ -318,14 +318,14 @@ class mssql extends \phpbb\db\driver\driver
$query_id = $this->query_result;
}
- if ($cache && $cache->sql_exists($query_id))
+ if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_freeresult($query_id);
}
- if (isset($this->open_queries[$query_id]))
+ if (isset($this->open_queries[(int) $query_id]))
{
- unset($this->open_queries[$query_id]);
+ unset($this->open_queries[(int) $query_id]);
return @mssql_free_result($query_id);
}
diff --git a/phpBB/phpbb/db/driver/mssql_odbc.php b/phpBB/phpbb/db/driver/mssql_odbc.php
index 9db34a69fb..b9881035c0 100644
--- a/phpBB/phpbb/db/driver/mssql_odbc.php
+++ b/phpBB/phpbb/db/driver/mssql_odbc.php
@@ -305,7 +305,7 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
$query_id = $this->query_result;
}
- if ($cache && $cache->sql_exists($query_id))
+ if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_freeresult($query_id);
}
diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index e6002fe1a3..aade311bcb 100644
--- a/phpBB/phpbb/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
@@ -471,7 +471,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
$query_id = $this->query_result;
}
- if ($cache->sql_exists($query_id))
+ if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_freeresult($query_id);
}
@@ -481,6 +481,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
unset($this->open_queries[(int) $query_id]);
return @sqlsrv_free_stmt($query_id);
}
+
return false;
}
diff --git a/phpBB/phpbb/db/driver/mysql.php b/phpBB/phpbb/db/driver/mysql.php
index c76126763d..d215453ccb 100644
--- a/phpBB/phpbb/db/driver/mysql.php
+++ b/phpBB/phpbb/db/driver/mysql.php
@@ -289,7 +289,7 @@ class mysql extends \phpbb\db\driver\mysql_base
$query_id = $this->query_result;
}
- if ($cache && $cache->sql_exists($query_id))
+ if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_freeresult($query_id);
}
diff --git a/phpBB/phpbb/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php
index 5dfab21455..4fba654d1e 100644
--- a/phpBB/phpbb/db/driver/oracle.php
+++ b/phpBB/phpbb/db/driver/oracle.php
@@ -621,7 +621,7 @@ class oracle extends \phpbb\db\driver\driver
$query_id = $this->query_result;
}
- if ($cache && $cache->sql_exists($query_id))
+ if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_freeresult($query_id);
}
diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php
index 7a98b90c73..9cbb1ecb07 100644
--- a/phpBB/phpbb/db/driver/postgres.php
+++ b/phpBB/phpbb/db/driver/postgres.php
@@ -350,7 +350,7 @@ class postgres extends \phpbb\db\driver\driver
$query_id = $this->query_result;
}
- if ($cache && $cache->sql_exists($query_id))
+ if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_freeresult($query_id);
}
diff --git a/phpBB/phpbb/db/driver/sqlite.php b/phpBB/phpbb/db/driver/sqlite.php
index a548fd2618..55a33284f2 100644
--- a/phpBB/phpbb/db/driver/sqlite.php
+++ b/phpBB/phpbb/db/driver/sqlite.php
@@ -261,7 +261,7 @@ class sqlite extends \phpbb\db\driver\driver
$query_id = $this->query_result;
}
- if ($cache && $cache->sql_exists($query_id))
+ if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_freeresult($query_id);
}
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php
index c42c84fb1f..b92b247c74 100644
--- a/phpBB/phpbb/notification/manager.php
+++ b/phpBB/phpbb/notification/manager.php
@@ -154,7 +154,7 @@ class manager
AND nt.notification_type_id = n.notification_type_id
AND nt.notification_type_enabled = 1';
$result = $this->db->sql_query($sql);
- $unread_count = (int) $this->db->sql_fetchfield('unread_count', $result);
+ $unread_count = (int) $this->db->sql_fetchfield('unread_count');
$this->db->sql_freeresult($result);
}
@@ -167,7 +167,7 @@ class manager
AND nt.notification_type_id = n.notification_type_id
AND nt.notification_type_enabled = 1';
$result = $this->db->sql_query($sql);
- $total_count = (int) $this->db->sql_fetchfield('total_count', $result);
+ $total_count = (int) $this->db->sql_fetchfield('total_count');
$this->db->sql_freeresult($result);
}
generated by cgit v1.2.1 (git 2.21.0) at 2025-07-24 11:47:57 +0000