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

2012-09-03 10:12:50 +12:00
parent f9e38429a8 ac31c38eed
commit 05f7680f3e
1 changed files with 2 additions and 3 deletions
@@ -292,11 +292,10 @@ class blog_entry implements renderable {
     * @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());