MDL-15310: removing unused variable, old commented code and adding a small adjustment...

diff --git a/blog/edit.php b/blog/edit.php
index a0f9d0a4ef948149880e27bf664dfcc2f135b3e3..21b863d8539740c7836e7c1afc372a1e4c4ab391 100755 (executable)
--- a/blog/edit.php
+++ b/blog/edit.php
@@ -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);

diff --git a/blog/edit_form.php b/blog/edit_form.php
index 499f22ea888ef4930d010647ef8ba09d6e4432ad..4d47139b9f99b1f26e60d4921105cc3e05ae45f8 100644 (file)
--- a/blog/edit_form.php
+++ b/blog/edit_form.php
@@ -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);
         }
+
     }
 
 }