removing changes made in trunk after directory changes made on next release

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1056 3807eeeb-6ff5-0310-8944-8be069107fe0

config/acl.ini.php

@@ -1,4 +1,4 @@
-;<? die(); ?>
+<? die(); ?>
 
 ; acl.ini.php - Cake ACL Configuration 
 ; ---------------------------------------------------------------------

libs/acl.php

@@ -43,6 +43,7 @@
  */
 class Acl
 {  
+   
    /**
     * Static function used to gain an instance of the correct ACL class.
     *
@@ -50,11 +51,12 @@ class Acl
     */
    function getACL() 
    {
-        require_once CONFIGS.'core.php';
-        require_once APP.'apis'.DS.ACL_FILENAME;
+      require_once(CONFIGS.'core.php');
+      require_once(APP.'apis'.DS.ACL_FILENAME);
 
       $myacl = ACL_CLASSNAME;
       return new $myacl;
    }
+
 }
 ?>

libs/acl_base.php

@@ -43,6 +43,7 @@ uses('error_messages');
  */
 class AclBase
 {
+   
    function AclBase()
    {
       //No instantiations or constructor calls (even statically)
@@ -51,10 +52,10 @@ class AclBase
          trigger_error(ERROR_ABSTRACT_CONSTRUCTION, E_USER_ERROR);
          return NULL;
       }
+      
    }
    
-    function check($aro, $aco)
-    {
-    }
+   function check($aro, $aco) {}
+   
 }   
 ?>

libs/bake.php

@@ -47,8 +47,8 @@ uses('object', 'inflector');
  * @subpackage cake.libs
  * @since      CakePHP v 0.2.9
   */
-class Bake extends Object
-{
+class Bake extends Object {
+
 /**
  * Standard input stream (php://stdin).
  *
@@ -107,8 +107,7 @@ class Bake extends Object
          case 'helper': return "<?php\n\nclass %s extends AppController {\n}\n\n?>";
          case 'test': return '<?php
 
-class %sTest extends TestCase
-{
+class %sTest extends TestCase {
    var $abc;
 
    // called before the tests
@@ -134,7 +133,8 @@ class %sTest extends TestCase
 }
 
 ?>';
-            default: return false;
+         default:
+            return false;
       }
    }
 
@@ -154,6 +154,7 @@ class %sTest extends TestCase
  */
    function __construct ($type, $names) 
    {
+
       $this->stdin = fopen('php://stdin', 'r');
       $this->stdout = fopen('php://stdout', 'w');
       $this->stderr = fopen('php://stderr', 'w');
@@ -163,17 +164,17 @@ class %sTest extends TestCase
 
       switch ($type) 
       {
+
          case 'model':
          case 'models':
             foreach ($names as $model_name)
-                {
                $this->newModel($model_name);
-                }
          break;
 
          case 'controller':
          case 'ctrl':
             $controller = array_shift($names);
+
             $add_actions = array();
             foreach ($names as $action) 
             {
@@ -198,9 +199,7 @@ class %sTest extends TestCase
       }
 
       if (!$this->actions)
-        {
          fwrite($this->stderr, "Nothing to do, quitting.\n");
-        }
             
    }
 
@@ -394,9 +393,7 @@ class %sTest extends TestCase
    {
       $out = array();
       foreach ($as as $a)
-        {
          $out[] = sprintf($this->template('action'), $a);
-        }
       return $out;
    }
 
@@ -546,9 +543,7 @@ class %sTest extends TestCase
    function createDir ($path) 
    {
       if (is_dir($path))
-        {
          return true;
-        }
 
       $shortPath = str_replace(ROOT, null, $path);