Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
995d0933
Commit
995d0933
authored
Oct 09, 2019
by
Robert Lyon
Committed by
Gerrit Code Review
Oct 09, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1847214: Failed to get a recordset: mysqli error"
parents
4f083581
09d6cc72
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
htdocs/blocktype/config.json.php
htdocs/blocktype/config.json.php
+1
-1
htdocs/blocktype/lib.php
htdocs/blocktype/lib.php
+1
-1
No files found.
htdocs/blocktype/config.json.php
View file @
995d0933
...
...
@@ -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
View file @
995d0933
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment