More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
index 9fa203f58d0baa47dfada5b283986a265c104da7..8c9e9d7ad414cce4e586b022e25b801469209b16 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -24,15 +24,26 @@ function friendica_init(&$a) {
                $visible_plugins = array();
                if(is_array($a->plugins) && count($a->plugins)) {
                        $r = q("select * from addon where hidden = 0");
-                       if(count($r))
+                       if(dbm::is_result($r))
                                foreach($r as $rr)
                                        $visible_plugins[] = $rr['name'];
                }
 
+               load_config('feature_lock');
+               $locked_features = array();
+               if(is_array($a->config['feature_lock']) && count($a->config['feature_lock'])) {
+                       foreach($a->config['feature_lock'] as $k => $v) {
+                               if($k === 'config_loaded')
+                                       continue;
+                               $locked_features[$k] = intval($v);
+                       }
+               }
+
                $data = Array(
                        'version' => FRIENDICA_VERSION,
                        'url' => z_root(),
                        'plugins' => $visible_plugins,
+                       'locked_features' => $locked_features,
                        'register_policy' =>  $register_policy[$a->config['register_policy']],
                        'admin' => $admin,
                        'site_name' => $a->config['sitename'],
@@ -69,7 +80,7 @@ function friendica_content(&$a) {
        $visible_plugins = array();
        if(is_array($a->plugins) && count($a->plugins)) {
                $r = q("select * from addon where hidden = 0");
-               if(count($r))
+               if(dbm::is_result($r))
                        foreach($r as $rr)
                                $visible_plugins[] = $rr['name'];
        }