Merge branch 'wip-MDL-34318-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

2012-09-03 10:12:15 +12:00
parent 1ac4b314f6 6117966d3b
commit 926fffa146
1 changed files with 2 additions and 3 deletions
@@ -405,11 +405,10 @@ class blog_entry {
     * @return void
     */
    public function delete() {
-        global $DB, $USER;
-
-        $returnurl = '';
+        global $DB;

        $this->delete_attachments();
+        $this->remove_associations();

        $DB->delete_records('post', array('id' => $this->id));
        tag_set('post', $this->id, array());