L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-52599-master' of git://github.com/danpoltawski/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2016-05-17 17:16:11 +08:00
committed by David Monllao
parent 7ae90fe03c 0be8dbd9b2
commit 96fd37749e
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/rss_client/edit_form.php
+14 -7
View File
@@ -47,13 +47,20 @@ class block_rss_client_edit_form extends block_edit_form {
$mform->setDefault('config_shownumentries', 5);
}
$rssfeeds = $DB->get_records_sql_menu('
SELECT id,
CASE WHEN preferredtitle = ? THEN ' . $DB->sql_compare_text('title', 64) .' ELSE preferredtitle END
FROM {block_rss_client}
WHERE userid = ? OR shared = 1
ORDER BY CASE WHEN preferredtitle = ? THEN ' . $DB->sql_compare_text('title', 64) . ' ELSE preferredtitle END ',
array('', $USER->id, ''));
$params = array('userid' => $USER->id);
$rssconfig = unserialize(base64_decode($this->block->instance->configdata));
list($insql, $inparams) = $DB->get_in_or_equal($rssconfig->rssid, SQL_PARAMS_NAMED);
$params += $inparams;
$titlesql = "CASE WHEN preferredtitle = '' THEN {$DB->sql_compare_text('title', 64)} ELSE preferredtitle END";
$rssfeeds = $DB->get_records_sql_menu("
SELECT id, $titlesql
FROM {block_rss_client}
WHERE userid = :userid OR shared = 1 OR id $insql
ORDER BY $titlesql",
$params);
if ($rssfeeds) {
$select = $mform->addElement('select', 'config_rssid', get_string('choosefeedlabel', 'block_rss_client'), $rssfeeds);
$select->setMultiple(true);