The object type "photo" is deprecated and was replaced by "image"

[friendica.git] / include / plugin.php

diff --git a/include/plugin.php b/include/plugin.php
index f6e4a7a88223e651ad5c7ec1131891338571459d..c7c44e433ddfc134112d29d797e9e0396182dab8 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -79,7 +79,7 @@ function reload_plugins() {
        if(strlen($plugins)) {
 
                $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-               if(count($r))
+               if (dbm::is_result($r))
                        $installed = $r;
                else
                        $installed = array();
@@ -150,7 +150,7 @@ function register_hook($hook,$file,$function,$priority=0) {
                dbesc($file),
                dbesc($function)
        );
-       if(count($r))
+       if (dbm::is_result($r))
                return true;
 
        $r = q("INSERT INTO `hook` (`hook`, `file`, `function`, `priority`) VALUES ( '%s', '%s', '%s', '%s' ) ",
@@ -187,7 +187,7 @@ function load_hooks() {
        $a = get_app();
        $a->hooks = array();
        $r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC, `file`");
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                foreach($r as $rr) {
                        if(! array_key_exists($rr['hook'],$a->hooks))
                                $a->hooks[$rr['hook']] = array();
@@ -410,13 +410,13 @@ function get_theme_info($theme){
  * @return string
  */
 function get_theme_screenshot($theme) {
-       $a = get_app();
        $exts = array('.png','.jpg');
        foreach($exts as $ext) {
-               if(file_exists('view/theme/' . $theme . '/screenshot' . $ext))
-                       return($a->get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
+               if(file_exists('view/theme/' . $theme . '/screenshot' . $ext)) {
+                       return(App::get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
+               }
        }
-       return($a->get_baseurl() . '/images/blank.png');
+       return(App::get_baseurl() . '/images/blank.png');
 }
 
 // install and uninstall theme
@@ -473,7 +473,7 @@ function service_class_allows($uid,$property,$usage = false) {
                $r = q("SELECT `service_class` FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($uid)
                );
-               if($r !== false and count($r)) {
+               if (dbm::is_result($r)) {
                        $service_class = $r[0]['service_class'];
                }
        }
@@ -503,7 +503,7 @@ function service_class_fetch($uid,$property) {
                $r = q("SELECT `service_class` FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($uid)
                );
-               if($r !== false and count($r)) {
+               if (dbm::is_result($r)) {
                        $service_class = $r[0]['service_class'];
                }
        }