aboutsummaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorjhunkeler <jhunkeler@c5b2fb0a-d05d-0410-98c8-828840a80ff6>2009-12-27 19:21:11 -0500
committerjhunkeler <jhunkeler@c5b2fb0a-d05d-0410-98c8-828840a80ff6>2009-12-27 19:21:11 -0500
commited943b32335933f369d9aa459689e986c10421ae (patch)
tree0c862c0f28308dc95e2e382a64a9d3e4bf51cca9 /includes
parentd526decc4884710ae7fafe7aa5171e7f59b24292 (diff)
downloadbayonetcms-ed943b32335933f369d9aa459689e986c10421ae.tar.gz
(OC) fixed some bugs in the admin panel caused by the new sql wrapper. *need to figure out the avatar for smflogin block.
git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@403 c5b2fb0a-d05d-0410-98c8-828840a80ff6
Diffstat (limited to 'includes')
-rw-r--r--includes/functions.php2
-rw-r--r--includes/sql.class.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/functions.php b/includes/functions.php
index bc169ff..4db70c5 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -469,7 +469,7 @@ define('BAYONET_LOG_ERROR','bayonet_log_error');
define('BAYONET_LOG_WARN','bayonet_log_warn');
define('BAYONET_LOG_INFO','bayonet_log_info');
-function WriteLog($message,$flag)
+function WriteLogBayonet($message,$flag)
{
global $config;
$enabled = $config['logs']['enabled'];
diff --git a/includes/sql.class.php b/includes/sql.class.php
index 3b93e2a..2bdb996 100644
--- a/includes/sql.class.php
+++ b/includes/sql.class.php
@@ -116,8 +116,8 @@ class Bayonet_SQL
decho("Fetching single row");
- while ($row = mysqli_fetch_row($p_result)) {
- $result[] = $row;
+ while ($row = mysqli_fetch_assoc($p_result)) {
+ $result = $row;
}
$this->Free($p_result);