aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-01-21 14:07:28 -0800
committerfriendica <info@friendica.com>2012-01-21 14:07:28 -0800
commitb5ec47590673ff9d147de1952d357b34e405a131 (patch)
treebd558e95fa168a793edd9f66b22698e64fceb410
parent43102e940a2c3c8994733527f39b1b26a46589b4 (diff)
downloadvolse-hubzilla-b5ec47590673ff9d147de1952d357b34e405a131.tar.gz
volse-hubzilla-b5ec47590673ff9d147de1952d357b34e405a131.tar.bz2
volse-hubzilla-b5ec47590673ff9d147de1952d357b34e405a131.zip
bug #253 use MSQLI_ASSOC, not MYSQL_ASSOC
-rwxr-xr-xboot.php2
-rwxr-xr-xinclude/dba.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index dabdafd8e..c8a7d6803 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1231' );
+define ( 'FRIENDICA_VERSION', '2.3.1232' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1115 );
diff --git a/include/dba.php b/include/dba.php
index 782c279d5..7455b6b3e 100755
--- a/include/dba.php
+++ b/include/dba.php
@@ -125,7 +125,7 @@ class dba {
$r = array();
if($this->mysqli) {
if($result->num_rows) {
- while($x = $result->fetch_array(MYSQL_ASSOC))
+ while($x = $result->fetch_array(MYSQLI_ASSOC))
$r[] = $x;
$result->free_result();
}