Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / include / plugin.php

diff --git a/include/plugin.php b/include/plugin.php
index 487ab575156d4812d6d959922496ac5f04efdb1a..89c783f900ae3532b17adfef171818cacb3efee8 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -129,7 +129,7 @@ function reload_plugins() {
  */
 function plugin_enabled($plugin) {
        $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = '%s'", $plugin);
-       return((bool)(count($r) > 0));
+       return ((dbm::is_result($r)) && (count($r) > 0));
 }
 
 
@@ -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