Commit 995d0933 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

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

parents 4f083581 09d6cc72
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment