From 5971402b42ed4af8ffa4652043d4f83b50e4d588 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Thu, 27 Aug 2009 09:16:10 +0300 Subject: [PATCH] Bug #1370 - Empty this training command: Implementing a fix for deletion the tool introduction texts. --- main/coursecopy/classes/CourseRecycler.class.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/main/coursecopy/classes/CourseRecycler.class.php b/main/coursecopy/classes/CourseRecycler.class.php index 422a914b13..70a222e46b 100644 --- a/main/coursecopy/classes/CourseRecycler.class.php +++ b/main/coursecopy/classes/CourseRecycler.class.php @@ -52,6 +52,7 @@ class CourseRecycler */ function recycle() { + $table_tool_intro = Database::get_course_table(TABLE_TOOL_INTRO); $table_linked_resources = Database :: get_course_table(TABLE_LINKED_RESOURCES, $this->course->destination_db); $table_item_properties = Database::get_course_table(TABLE_ITEM_PROPERTY); foreach ($this->course->resources as $type => $resources) @@ -60,8 +61,16 @@ class CourseRecycler { $sql = "DELETE FROM ".$table_linked_resources." WHERE (source_type = '".$type."' AND source_id = '".$id."') OR (resource_type = '".$type."' AND resource_id = '".$id."') "; api_sql_query($sql,__FILE__,__LINE__); - $sql = "DELETE FROM ".$table_item_properties." WHERE tool ='".$resource->get_tool()."' AND ref=".$id; - api_sql_query($sql); + if(is_numeric($id)) + { + $sql = "DELETE FROM ".$table_item_properties." WHERE tool ='".$resource->get_tool()."' AND ref=".$id; + api_sql_query($sql, __FILE__, __LINE__); + } + elseif ($type == RESOURCE_TOOL_INTRO) + { + $sql = "DELETE FROM $table_tool_intro WHERE id='$id'"; + api_sql_query($sql, __FILE__, __LINE__); + } } } $this->recycle_links();