Permalink
Browse files

Merge branch '2.0' of github.com:cakephp/cakephp into 2.0

  • Loading branch information...
2 parents c45538a + b1f8d21 commit 90d86678fab12eb49a4da0cac5f892f05aad436e @lorenzo lorenzo committed Sep 21, 2011
View
@@ -30,16 +30,16 @@
* The settings below can be used to set additional paths to models, views and controllers.
*
* App::build(array(
- * 'plugins' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'),
- * 'models' => array('/full/path/to/models/', '/next/full/path/to/models/'),
- * 'views' => array('/full/path/to/views/', '/next/full/path/to/views/'),
- * 'controllers' => array('/full/path/to/controllers/', '/next/full/path/to/controllers/'),
- * 'datasources' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'),
- * 'behaviors' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'),
- * 'components' => array('/full/path/to/components/', '/next/full/path/to/components/'),
- * 'helpers' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'),
- * 'vendors' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'),
- * 'shells' => array('/full/path/to/shells/', '/next/full/path/to/shells/'),
+ * 'Plugin' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'),
+ * 'Model' => array('/full/path/to/models/', '/next/full/path/to/models/'),
+ * 'View' => array('/full/path/to/views/', '/next/full/path/to/views/'),
+ * 'Controller' => array('/full/path/to/controllers/', '/next/full/path/to/controllers/'),
+ * 'Model/Datasource' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'),
+ * 'Model/Behavior' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'),
+ * 'Controller/Component' => array('/full/path/to/components/', '/next/full/path/to/components/'),
+ * 'View/Helper' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'),
+ * 'Vendor' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'),
+ * 'Console/Command' => array('/full/path/to/shells/', '/next/full/path/to/shells/'),
* 'locales' => array('/full/path/to/locale/', '/next/full/path/to/locale/')
* ));
*
@@ -62,4 +62,4 @@
* CakePlugin::loadAll(); // Loads all plugins at once
* CakePlugin::load('DebugKit'); //Loads a single plugin named DebugKit
*
- */
+ */
@@ -405,6 +405,8 @@ public function fieldValidation($fieldName, $metaData, $primaryKey = 'id') {
$guess = $methods['date'];
} elseif ($metaData['type'] == 'time') {
$guess = $methods['time'];
+ } elseif ($metaData['type'] == 'inet') {
+ $guess = $methods['ip'];
}
}
Oops, something went wrong.

0 comments on commit 90d8667

Please sign in to comment.