Merge "Bug 1847214: Failed to get a recordset: mysqli error"

htdocs/blocktype/config.json.php

@@ -30,7 +30,7 @@ if (!empty($direction)) {
 // return updated info
 $type = array();
 $blocks = get_records_sql_array("SELECT b.name, b.artefactplugin, bc.sortorder,
-                                  (SELECT COUNT(bi.*) FROM {block_instance} bi WHERE bi.blocktype = b.name) AS blockcount
+                                  (SELECT COUNT(*) FROM {block_instance} bi WHERE bi.blocktype = b.name) AS blockcount
                                   FROM {blocktype_installed} b
                                   JOIN {blocktype_installed_category} bc ON bc.blocktype = b.name
                                   WHERE b.active = 1

htdocs/blocktype/lib.php

@@ -99,7 +99,7 @@ abstract class PluginBlocktype extends Plugin implements IPluginBlocktype {
     public static function get_base_config_options() {
         $type = array();
         $blocks = get_records_sql_array("SELECT b.name, b.artefactplugin, bc.sortorder,
-                                   (SELECT COUNT(bi.*) FROM {block_instance} bi WHERE bi.blocktype = b.name) AS blockcount
+                                   (SELECT COUNT(*) FROM {block_instance} bi WHERE bi.blocktype = b.name) AS blockcount
                                   FROM {blocktype_installed} b
                                   JOIN {blocktype_installed_category} bc ON bc.blocktype = b.name
                                   WHERE b.active = 1