diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/functions.php | 4 | ||||
| -rw-r--r-- | includes/sql.class.php | 26 |
2 files changed, 27 insertions, 3 deletions
diff --git a/includes/functions.php b/includes/functions.php index 5d3dc7d..09fc456 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -621,9 +621,7 @@ function GetBlocks($position = BLOCK_LEFT) $query = sprintf("SELECT block_id, active, weight, position, dir_name, title FROM bayonet_blocks WHERE active = 1 AND position = %d ORDER BY weight", (int)$position); $result = $db->Query($query); - /* Is the result valid? */ - if($db->Rows($result) < 1) - return false; + $blocks = $db->Fetch($result); if(empty($blocks)) return; diff --git a/includes/sql.class.php b/includes/sql.class.php index 6bda00f..c32de63 100644 --- a/includes/sql.class.php +++ b/includes/sql.class.php @@ -53,6 +53,14 @@ class Bayonet_SQL return mysqli_select_db($GLOBALS['___mysqli_ston'], $db); } + private function validResult($p_result) + { + if($this->Rows($p_result) > 0) + return true; + else + return false; + } + public function Query($str) { global $db_queries; @@ -78,6 +86,12 @@ class Bayonet_SQL $db_fetches++; decho('Fetching result'); + if(!$this->validResult($p_result)) + { + decho('Result was not valid.'); + return array(); + } + while ($row = mysqli_fetch_array($p_result, MYSQLI_ASSOC)) { $result[] = $row; @@ -94,6 +108,12 @@ class Bayonet_SQL decho("Fetching object result"); + if(!$this->validResult($p_result)) + { + decho('Result was not valid.'); + return (object)array(); + } + while ($row = mysqli_fetch_object($p_result, $class)) { if($no_array == true) @@ -121,6 +141,12 @@ class Bayonet_SQL decho("Fetching single row"); + if(!$this->validResult($p_result)) + { + decho('Result was not valid.'); + return array(); + } + while ($row = mysqli_fetch_assoc($p_result)) { $result = $row; } |