From 8ec0e8471f424ead77a335277d86706c4b6d3add Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 18 Jan 2009 09:06:46 +0000 Subject: Drag and drop in the admin dashboard now saves the location. * Make block_adder a real block * Suppress the "close" link on block_adder * Move the drag/drop JS into the core code out of the admin theme --- core/controllers/welcome.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/controllers/welcome.php') diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php index af9932d4..d957e335 100644 --- a/core/controllers/welcome.php +++ b/core/controllers/welcome.php @@ -507,12 +507,12 @@ class Welcome_Controller extends Template_Controller { if ($entry == "." || $entry == "..") { continue; } - if (is_dir(VARPATH . $entry) & $entry != "g3_installer") { + if (is_dir(VARPATH . $entry) & $entry != "g3_installer") { $sub_dirs[] = "\"$entry\""; } } $var_dir->close(); - + $init_g3 = array_merge($init_g3, array( "foreach (array(" . implode(", ", $sub_dirs) . ") as \$dir) {", " if (!@mkdir(\"var/\$dir\")) {", @@ -528,7 +528,7 @@ class Welcome_Controller extends Template_Controller { } file_put_contents("$install_data/init_var.php", implode("\n", $init_g3)); - + // Dump the database tables and data. $dbconfig = Kohana::config('database.default'); $dbconfig = $dbconfig["connection"]; -- cgit v1.2.3