aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/mysqli.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-10-04 15:15:40 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-10-04 15:15:40 +0000
commit26aba1a1f170ac51a56fe86bbc19588e0efee3c3 (patch)
treea92878b658c325297e5054d5622d642934b189df /phpBB/includes/db/mysqli.php
parentf7f6e9bcde7a1508109146f462d4627a484eb594 (diff)
downloadforums-26aba1a1f170ac51a56fe86bbc19588e0efee3c3.tar
forums-26aba1a1f170ac51a56fe86bbc19588e0efee3c3.tar.gz
forums-26aba1a1f170ac51a56fe86bbc19588e0efee3c3.tar.bz2
forums-26aba1a1f170ac51a56fe86bbc19588e0efee3c3.tar.xz
forums-26aba1a1f170ac51a56fe86bbc19588e0efee3c3.zip
- finally removed sql_numrows
- sql_fetchfield now in dbal.php - check query id correctly as well as other tiny fixes git-svn-id: file:///svn/phpbb/trunk@6439 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db/mysqli.php')
-rw-r--r--phpBB/includes/db/mysqli.php63
1 files changed, 5 insertions, 58 deletions
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 35306206f1..c696fd58a9 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -175,27 +175,6 @@ class dbal_mysqli extends dbal
}
/**
- * Return number of rows
- * Not used within core code
- */
- function sql_numrows($query_id = false)
- {
- global $cache;
-
- if (!$query_id)
- {
- $query_id = $this->query_result;
- }
-
- if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
- {
- return $cache->sql_numrows($query_id);
- }
-
- return ($query_id) ? @mysqli_num_rows($query_id) : false;
- }
-
- /**
* Return number of affected rows
*/
function sql_affectedrows()
@@ -210,7 +189,7 @@ class dbal_mysqli extends dbal
{
global $cache;
- if (!$query_id)
+ if ($query_id === false)
{
$query_id = $this->query_result;
}
@@ -220,39 +199,7 @@ class dbal_mysqli extends dbal
return $cache->sql_fetchrow($query_id);
}
- return ($query_id) ? @mysqli_fetch_assoc($query_id) : false;
- }
-
- /**
- * Fetch field
- * if rownum is false, the current row is used, else it is pointing to the row (zero-based)
- */
- function sql_fetchfield($field, $rownum = false, $query_id = false)
- {
- global $cache;
-
- if (!$query_id)
- {
- $query_id = $this->query_result;
- }
-
- if ($query_id)
- {
- if ($rownum !== false)
- {
- $this->sql_rowseek($rownum, $query_id);
- }
-
- if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
- {
- return $cache->sql_fetchfield($query_id, $field);
- }
-
- $row = $this->sql_fetchrow($query_id);
- return isset($row[$field]) ? $row[$field] : false;
- }
-
- return false;
+ return ($query_id !== false) ? @mysqli_fetch_assoc($query_id) : false;
}
/**
@@ -263,7 +210,7 @@ class dbal_mysqli extends dbal
{
global $cache;
- if (!$query_id)
+ if ($query_id === false)
{
$query_id = $this->query_result;
}
@@ -273,7 +220,7 @@ class dbal_mysqli extends dbal
return $cache->sql_rowseek($rownum, $query_id);
}
- return ($query_id) ? @mysqli_data_seek($query_id, $rownum) : false;
+ return ($query_id !== false) ? @mysqli_data_seek($query_id, $rownum) : false;
}
/**
@@ -291,7 +238,7 @@ class dbal_mysqli extends dbal
{
global $cache;
- if (!$query_id)
+ if ($query_id === false)
{
$query_id = $this->query_result;
}