if old "v6" folder cannot be deleted, update will WARN but will not fail

moodle · Feb 1, 2006 · abbd2c4 · abbd2c4
1 parent 7fec4cb
commit abbd2c4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/mod/hotpot/db/update_to_v2.php b/mod/hotpot/db/update_to_v2.php
@@ -208,8 +208,11 @@ function hotpot_update_to_v2_1() {
 		$ds = DIRECTORY_SEPARATOR;
 		$dir = "mod{$ds}hotpot{$ds}v6";
 		print "removing old templates ($dir) ... ";
-		$ok = hotpot_rm("$CFG->dirroot{$ds}$dir", false);
+		if (hotpot_rm("$CFG->dirroot{$ds}$dir", false)) {
-		print $ok ? get_string('success') : 'failed';
+			print get_string('success');
+		} else {
+			print "failed<br>Please remove '$CFG->dirroot{$ds}$dir' manually";
+		}
 		print "<br />\n";
 	}
 	return $ok;