Merge branch 'rewrites/dbm_is_result' into develop

2016-12-19 14:47:05 +01:00
parent 884f44ce94 a96eb3428d
commit dac1dbd3e9
11 changed files with 20 additions and 19 deletions
--- 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));
 }