Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object...

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index 97092c140f2f58ef9bd035d1008e5123a0be1f4f..b5af1373a443703b7ec35b862cc4cf84fdbc5c66 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -165,7 +165,7 @@ function install_content(&$a) {
 
        if($db && $db->connected) {
                $r = q("SELECT COUNT(*) as `total` FROM `user`");
-               if($r && count($r) && $r[0]['total']) {
+               if (dbm::is_result($r) && $r[0]['total']) {
                        $tpl = get_markup_template('install.tpl');
                        return replace_macros($tpl, array(
                                '$title' => $install_title,