Merge pull request #1558 from dereuromark/2.4-unify-name

2.4 unify name
cakephp · Aug 25, 2013 · e7672b9 · e7672b9
2 parents 42feb8d + 80d55fe
commit e7672b9
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 32 deletions.
diff --git a/app/Config/Schema/db_acl.php b/app/Config/Schema/db_acl.php
@@ -28,8 +28,6 @@
  */
 class DbAclSchema extends CakeSchema {
 
-	public $name = 'DbAcl';
-
 	public function before($event = array()) {
 		return true;
 	}

diff --git a/app/Controller/PagesController.php b/app/Controller/PagesController.php
@@ -31,13 +31,6 @@
  */
 class PagesController extends AppController {
 
-/**
- * Controller name
- *
- * @var string
- */
-	public $name = 'Pages';
-
 /**
  * This controller does not use a model
  *

diff --git a/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php b/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
@@ -19,8 +19,6 @@
  */
 class DbAclSchema extends CakeSchema {
 
-	public $name = 'DbAcl';
-
 	public function before($event = array()) {
 		return true;
 	}

diff --git a/lib/Cake/Console/Templates/skel/Controller/PagesController.php b/lib/Cake/Console/Templates/skel/Controller/PagesController.php
@@ -23,13 +23,6 @@
  */
 class PagesController extends AppController {
 
-/**
- * Controller name
- *
- * @var string
- */
-	public $name = 'Pages';
-
 /**
  * This controller does not use a model
  *

diff --git a/lib/Cake/Controller/CakeErrorController.php b/lib/Cake/Controller/CakeErrorController.php
@@ -31,13 +31,6 @@
  */
 class CakeErrorController extends AppController {
 
-/**
- * Controller name
- *
- * @var string
- */
-	public $name = 'CakeError';
-
 /**
  * Uses Property
  *

diff --git a/lib/Cake/Model/Permission.php b/lib/Cake/Model/Permission.php
@@ -26,13 +26,6 @@
  */
 class Permission extends AppModel {
 
-/**
- * Model name
- *
- * @var string
- */
-	public $name = 'Permission';
-
 /**
  * Explicitly disable in-memory query caching
  *