mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 20:50:21 +01:00
MDL-15310: removing unused variable, old commented code and adding a small adjustment to the tag code.
This commit is contained in:
parent
cda19b7ade
commit
47a2c30b67
@ -156,7 +156,6 @@ function do_delete($post) {
|
||||
global $returnurl, $DB;
|
||||
|
||||
$status = $DB->delete_records('post', array('id'=>$post->id));
|
||||
//$status = $DB->delete_records('blog_tag_instance', array('entryid'=>$post->id)) and $status;
|
||||
tag_set('post', $post->id, array());
|
||||
|
||||
blog_delete_old_attachments($post);
|
||||
|
@ -37,15 +37,6 @@ class blog_edit_form extends moodleform {
|
||||
$mform->addElement('header', 'tagshdr', get_string('tags', 'tag'));
|
||||
$mform->createElement('select', 'otags', get_string('otags','tag'));
|
||||
|
||||
$js_escape = array(
|
||||
"\r" => '\r',
|
||||
"\n" => '\n',
|
||||
"\t" => '\t',
|
||||
"'" => "\\'",
|
||||
'"' => '\"',
|
||||
'\\' => '\\\\'
|
||||
);
|
||||
|
||||
$otagsselEl =& $mform->addElement('select', 'otags', get_string('otags', 'tag'), array(), 'size="5"');
|
||||
$otagsselEl->setMultiple(true);
|
||||
$this->otags_select_setup();
|
||||
@ -75,16 +66,17 @@ class blog_edit_form extends moodleform {
|
||||
*
|
||||
*/
|
||||
function otags_select_setup(){
|
||||
global $CFG, $DB;
|
||||
global $DB;
|
||||
|
||||
$mform =& $this->_form;
|
||||
if ($otagsselect =& $mform->getElement('otags')) {
|
||||
$otagsselect->removeOptions();
|
||||
}
|
||||
$namefield = empty($CFG->keeptagnamecase) ? 'name' : 'rawname';
|
||||
if ($otags = $DB->get_records_sql_menu("SELECT id, $namefield FROM {tag} WHERE tagtype='official' ORDER by name ASC")){
|
||||
if ($otags = $DB->get_records_sql_menu("SELECT id, $namefield FROM {tag} WHERE tagtype='official' ORDER by $namefield ASC")) {
|
||||
$otagsselect->loadArray($otags);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user