From 4e107dac41f58d3ed6064809d8ee461ea8592e2c Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Fri, 6 Feb 2009 16:39:18 +0000 Subject: Implement fix for ticket #35. *** Requires reinstall of core *** * Added new field in items table (path) which is sanitized version of name. * Added __set method on Items_module to set the path field whenever the name field is changed. * Made some changes to the scaffolding so missing the path column would not kill the scaffolding. * Changed MY_url::site so not having a 3rd parameter won't throw an error. --- core/controllers/scaffold.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'core/controllers') diff --git a/core/controllers/scaffold.php b/core/controllers/scaffold.php index 8266ba8f..395e032d 100644 --- a/core/controllers/scaffold.php +++ b/core/controllers/scaffold.php @@ -112,8 +112,11 @@ class Scaffold_Controller extends Template_Controller { // Since we're in a state of flux, it's possible that other stuff went wrong with the // uninstall, so back off and nuke it from orbit. It's the only way to be sure. $db = Database::instance(); - foreach ($db->list_tables() as $table) { - $db->query("DROP TABLE `$table`"); + $tables = $db->list_tables(); + if (!empty($tables)) { + foreach ($db->list_tables() as $table) { + $db->query("DROP TABLE `$table`"); + } } set_error_handler($old_handler); } else { @@ -423,7 +426,9 @@ class Scaffold_Controller extends Template_Controller { function _create_directories() { foreach (array("logs", "uploads") as $dir) { - @mkdir(VARPATH . "$dir"); + if (!file_exists(VARPATH . "$dir")) { + @mkdir(VARPATH . "$dir"); + } } } -- cgit v1.2.3