Permalink
Browse files

Merge branch 'mergers' into 1.2-merger

Conflicts:
	cake/libs/view/helpers/text.php
	cake/tests/cases/libs/view/helpers/text.test.php
  • Loading branch information...
2 parents 1f5c6ea + b3b9ae3 commit 24b636cc71514766a013a04d6a74e4a2fc507446 @markstory markstory committed Dec 7, 2009
View
@@ -102,11 +102,6 @@
/**
* Path to the libs directory.
*/
- define('INFLECTIONS', CAKE.'config'.DS.'inflections'.DS);
-
-/**
- * Path to the libs directory.
- */
define('LIBS', CAKE.'libs'.DS);
/**
@@ -198,13 +193,6 @@
}
/**
- * Path to the Pear directory
- * The purporse is to make it easy porting Pear libs into Cake
- * without setting the include_path PHP variable.
- */
- define('PEAR', VENDORS.'Pear'.DS);
-
-/**
* Full url prefix
*/
if (!defined('FULL_BASE_URL')) {
@@ -153,10 +153,9 @@ function bake($plugin) {
'tests' . DS . 'cases' . DS . 'models',
'tests' . DS . 'groups',
'tests' . DS . 'fixtures',
- 'vendors' . DS . 'img',
- 'vendors' . DS . 'js',
- 'vendors' . DS . 'css',
- 'vendors' . DS . 'shells' . DS . 'tasks'
+ 'vendors',
+ 'vendors' . DS . 'shells' . DS . 'tasks',
+ 'webroot'
);
foreach ($directories as $directory) {
View
@@ -62,14 +62,6 @@ class Dispatcher extends Object {
var $here = false;
/**
- * Admin route (if on it)
- *
- * @var string
- * @access public
- */
- var $admin = false;
-
-/**
* Plugin being served (if any)
*
* @var string
@@ -293,7 +285,7 @@ function parseParams($fromUrl) {
$params['action'] = 'index';
}
if (isset($params['form']['data'])) {
- $params['data'] = Router::stripEscape($params['form']['data']);
+ $params['data'] = $params['form']['data'];
unset($params['form']['data']);
}
if (isset($_GET)) {
@@ -429,6 +429,9 @@ function blackHole(&$controller, $error = '') {
* @access protected
*/
function _requireMethod($method, $actions = array()) {
+ if (isset($actions[0]) && is_array($actions[0])) {
+ $actions = $actions[0];
+ }
$this->{'require' . $method} = (empty($actions)) ? array('*'): $actions;
}
@@ -49,14 +49,6 @@ class SessionComponent extends CakeSession {
var $__started = false;
/**
- * Used to determine if request are from an Ajax request
- *
- * @var boolean
- * @access private
- */
- var $__bare = 0;
-
-/**
* Class constructor
*
* @param string $base The base path for the Session
@@ -70,19 +62,6 @@ function __construct($base = null) {
}
/**
- * Initializes the component, gets a reference to Controller::$param['bare'].
- *
- * @param object $controller A reference to the controller
- * @return void
- * @access public
- */
- function initialize(&$controller) {
- if (isset($controller->params['bare'])) {
- $this->__bare = $controller->params['bare'];
- }
- }
-
-/**
* Startup method.
*
* @param object $controller Instantiating controller
@@ -1933,7 +1933,7 @@ function conditionKeysToString($conditions, $quoteValues = true, $model = null)
} else {
$data = $this->__quoteFields($key) . ' IN (';
}
- if ($quoteValues || strpos($value[0], '-!') !== 0) {
+ if ($quoteValues) {
if (is_object($model)) {
$columnType = $model->getColumnType($key);
}
Oops, something went wrong.

0 comments on commit 24b636c

Please sign in to comment.