Changeset 57366

Timestamp:

03/07/08 17:36:52 (2 months ago)

Author:

sminnee

Message:

Improved operation of db/build under cli

Files:

• modules/sapphire/branches/2.2.2-assets/core/model/DatabaseAdmin.php (modified) (5 diffs)

modules/sapphire/branches/2.2.2-assets/core/model/DatabaseAdmin.php

@@ -76 +76 @@
          */
         function build() {
-                if(Director::isLive() && Security::database_is_ready() && (!Member::currentUser() || !Member::currentUser()->isAdmin())) {
+                if(Director::isLive() && !Director::is_cli() && Security::database_is_ready() && (!Member::currentUser() || !Member::currentUser()->isAdmin())) {
                         Security::permissionFailure($this,
                                 "This page is secured and you need administrator rights to access it. " .
@@ -162 +162 @@
 
                 if(!$quiet) {
-                        echo '<p><b>Creating database tables</b></p>';
+                        echo '\n<p><b>Creating database tables</b></p>\n\n';
                 }
 
@@ -171 +171 @@
                         if(strpos($dataClass,'Test_') === false) {
                                 if(!$quiet) {
-                                        echo "<li>$dataClass</li>";
+                                        echo "<li>$dataClass</li>\n";
                                 }
                                 singleton($dataClass)->requireTable();
@@ -182 +182 @@
                 if($populate) {
                         if(!$quiet) {
-                                echo '<p><b>Creating database records</b></p>';
+                                echo '\n<p><b>Creating database records</b></p>\n\n';
                         }
 
@@ -190 +190 @@
                                 if(strpos($dataClass,'Test_') === false) {
                                         if(!$quiet) {
-                                                echo "<li>$dataClass</li>";
+                                                echo "<li>$dataClass</li>\n";
                                         }