Merge branch '2.0' into 2.0-request

Conflicts:
	cake/libs/router.php
	cake/tests/cases/libs/router.test.php
This commit is contained in:
mark_story 2010-05-17 21:52:14 -04:00
commit f114d4299d
437 changed files with 17 additions and 550 deletions

View file

@ -48,4 +48,3 @@
* Inflector::rules('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
*
*/
?>

View file

@ -294,4 +294,3 @@
*
*/
Cache::config('default', array('engine' => 'File'));
?>

View file

@ -93,4 +93,3 @@ class DATABASE_CONFIG {
'prefix' => '',
);
}
?>

View file

@ -31,4 +31,3 @@
* ...and connect the rest of 'Pages' controller's urls.
*/
Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
?>

View file

@ -71,4 +71,3 @@ class DbAclSchema extends CakeSchema {
);
}
?>

View file

@ -48,4 +48,3 @@ class i18nSchema extends CakeSchema {
);
}
?>

View file

@ -45,4 +45,3 @@ class SessionsSchema extends CakeSchema {
);
}
?>

View file

@ -16,4 +16,3 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
require 'webroot' . DIRECTORY_SEPARATOR . 'index.php';
?>

View file

@ -92,4 +92,3 @@ if (!class_exists('File')) {
header("Cache-Control: max-age=86400, must-revalidate"); // HTTP/1.1
header("Pragma: cache"); // HTTP/1.0
print $output;
?>

View file

@ -85,4 +85,3 @@
if (Configure::read() > 0) {
echo "<!-- " . round(microtime(true) - $TIME_START, 4) . "s -->";
}
?>

View file

@ -92,5 +92,3 @@ require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php';
$Dispatcher = new CakeTestSuiteDispatcher();
$Dispatcher->dispatch();
?>

View file

@ -659,5 +659,3 @@ if (!function_exists('sortByKey')) {
$string = str_replace('/', '_', $string);
return $string;
}
?>

View file

@ -37,4 +37,3 @@ require LIBS . 'set.php';
require LIBS . 'cache.php';
Configure::getInstance();
require CAKE . 'dispatcher.php';
?>

View file

@ -18,4 +18,3 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
return $config['Cake.version'] = '1.3.0';
?>

View file

@ -229,4 +229,3 @@ if (!defined('CSS_URL')) {
if (!defined('JS_URL')) {
define('JS_URL', 'js/');
}
?>

View file

@ -72,4 +72,3 @@ $config['0080_00ff'][] = array('upper' => 220, 'status' => 'C', 'lower' => array
$config['0080_00ff'][] = array('upper' => 221, 'status' => 'C', 'lower' => array(253)); /* LATIN CAPITAL LETTER Y WITH ACUTE */
$config['0080_00ff'][] = array('upper' => 222, 'status' => 'C', 'lower' => array(254)); /* LATIN CAPITAL LETTER THORN */
$config['0080_00ff'][] = array('upper' => 223, 'status' => 'F', 'lower' => array(115, 115)); /* LATIN SMALL LETTER SHARP S */
?>

View file

@ -105,4 +105,3 @@ $config['0100_017f'][] = array('upper' => 377, 'status' => 'C', 'lower' => array
$config['0100_017f'][] = array('upper' => 379, 'status' => 'C', 'lower' => array(380)); /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
$config['0100_017f'][] = array('upper' => 381, 'status' => 'C', 'lower' => array(382)); /* LATIN CAPITAL LETTER Z WITH CARON */
$config['0100_017f'][] = array('upper' => 383, 'status' => 'C', 'lower' => array(115)); /* LATIN SMALL LETTER LONG S */
?>

View file

@ -147,4 +147,3 @@ $config['0180_024F'][] = array('upper' => 584, 'status' => 'C', 'lower' => array
$config['0180_024F'][] = array('upper' => 586, 'status' => 'C', 'lower' => array(587)); /* LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL */
$config['0180_024F'][] = array('upper' => 588, 'status' => 'C', 'lower' => array(589)); /* LATIN CAPITAL LETTER R WITH STROKE */
$config['0180_024F'][] = array('upper' => 590, 'status' => 'C', 'lower' => array(591)); /* LATIN CAPITAL LETTER Y WITH STROKE */
?>

View file

@ -40,4 +40,3 @@
* See the discussions of case mapping in the Unicode Standard for more information.
*/
$config['0250_02af'][] = array('upper' => 422, 'status' => 'C', 'lower' => array(640));
?>

View file

@ -101,4 +101,3 @@ $config['0370_03ff'][] = array('upper' => 1018, 'status' => 'C', 'lower' => arra
$config['0370_03ff'][] = array('upper' => 1021, 'status' => 'C', 'lower' => array(891)); /* GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL */
$config['0370_03ff'][] = array('upper' => 1022, 'status' => 'C', 'lower' => array(892)); /* GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL */
$config['0370_03ff'][] = array('upper' => 1023, 'status' => 'C', 'lower' => array(893)); /* GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL */
?>

View file

@ -163,4 +163,3 @@ $config['0400_04ff'][] = array('upper' => 1272, 'status' => 'C', 'lower' => arra
$config['0400_04ff'][] = array('upper' => 1274, 'status' => 'C', 'lower' => array(1275)); /* CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK */
$config['0400_04ff'][] = array('upper' => 1276, 'status' => 'C', 'lower' => array(1277)); /* CYRILLIC CAPITAL LETTER HA WITH HOOK */
$config['0400_04ff'][] = array('upper' => 1278, 'status' => 'C', 'lower' => array(1279)); /* CYRILLIC CAPITAL LETTER HA WITH STROKE */
?>

View file

@ -47,4 +47,3 @@ $config['0500_052f'][] = array('upper' => 1288, 'status' => 'C', 'lower' => arra
$config['0500_052f'][] = array('upper' => 1290, 'status' => 'C', 'lower' => array(1291)); /* CYRILLIC CAPITAL LETTER KOMI NJE */
$config['0500_052f'][] = array('upper' => 1292, 'status' => 'C', 'lower' => array(1293)); /* CYRILLIC CAPITAL LETTER KOMI SJE */
$config['0500_052f'][] = array('upper' => 1294, 'status' => 'C', 'lower' => array(1295)); /* CYRILLIC CAPITAL LETTER KOMI TJE */
?>

View file

@ -77,4 +77,3 @@ $config['0530_058f'][] = array('upper' => 1363, 'status' => 'C', 'lower' => arra
$config['0530_058f'][] = array('upper' => 1364, 'status' => 'C', 'lower' => array(1412)); /* ARMENIAN CAPITAL LETTER KEH */
$config['0530_058f'][] = array('upper' => 1365, 'status' => 'C', 'lower' => array(1413)); /* ARMENIAN CAPITAL LETTER OH */
$config['0530_058f'][] = array('upper' => 1366, 'status' => 'C', 'lower' => array(1414)); /* ARMENIAN CAPITAL LETTER FEH */
?>

View file

@ -167,4 +167,3 @@ $config['1e00_1eff'][] = array('upper' => 7922, 'status' => 'C', 'lower' => arra
$config['1e00_1eff'][] = array('upper' => 7924, 'status' => 'C', 'lower' => array(7925)); /* LATIN CAPITAL LETTER Y WITH DOT BELOW */
$config['1e00_1eff'][] = array('upper' => 7926, 'status' => 'C', 'lower' => array(7927)); /* LATIN CAPITAL LETTER Y WITH HOOK ABOVE */
$config['1e00_1eff'][] = array('upper' => 7928, 'status' => 'C', 'lower' => array(7929)); /* LATIN CAPITAL LETTER Y WITH TILDE */
?>

View file

@ -215,4 +215,3 @@ $config['1f00_1fff'][] = array('upper' => 8186, 'status' => 'C', 'lower' => arra
$config['1f00_1fff'][] = array('upper' => 8187, 'status' => 'C', 'lower' => array(8061)); /* GREEK CAPITAL LETTER OMEGA WITH OXIA */
$config['1f00_1fff'][] = array('upper' => 8188, 'status' => 'F', 'lower' => array(969, 953)); /* GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI */
$config['1f00_1fff'][] = array('upper' => 8188, 'status' => 'S', 'lower' => array(8179)); /* GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI */
?>

View file

@ -43,4 +43,3 @@ $config['2100_214f'][] = array('upper' => 8486, 'status' => 'C', 'lower' => arra
$config['2100_214f'][] = array('upper' => 8490, 'status' => 'C', 'lower' => array(107)); /* KELVIN SIGN */
$config['2100_214f'][] = array('upper' => 8491, 'status' => 'C', 'lower' => array(229)); /* ANGSTROM SIGN */
$config['2100_214f'][] = array('upper' => 8498, 'status' => 'C', 'lower' => array(8526)); /* TURNED CAPITAL F */
?>

View file

@ -56,4 +56,3 @@ $config['2150_218f'][] = array('upper' => 8557, 'status' => 'C', 'lower' => arra
$config['2150_218f'][] = array('upper' => 8558, 'status' => 'C', 'lower' => array(8574)); /* ROMAN NUMERAL FIVE HUNDRED */
$config['2150_218f'][] = array('upper' => 8559, 'status' => 'C', 'lower' => array(8575)); /* ROMAN NUMERAL ONE THOUSAND */
$config['2150_218f'][] = array('upper' => 8579, 'status' => 'C', 'lower' => array(8580)); /* ROMAN NUMERAL REVERSED ONE HUNDRED */
?>

View file

@ -65,4 +65,3 @@ $config['2460_24ff'][] = array('upper' => 9420, 'status' => 'C', 'lower' => arra
$config['2460_24ff'][] = array('upper' => 9421, 'status' => 'C', 'lower' => array(9447)); /* CIRCLED LATIN CAPITAL LETTER X */
$config['2460_24ff'][] = array('upper' => 9422, 'status' => 'C', 'lower' => array(9448)); /* CIRCLED LATIN CAPITAL LETTER Y */
$config['2460_24ff'][] = array('upper' => 9423, 'status' => 'C', 'lower' => array(9449)); /* CIRCLED LATIN CAPITAL LETTER Z */
?>

View file

@ -86,4 +86,3 @@ $config['2c00_2c5f'][] = array('upper' => 11307, 'status' => 'C', 'lower' => arr
$config['2c00_2c5f'][] = array('upper' => 11308, 'status' => 'C', 'lower' => array(11356)); /* GLAGOLITIC CAPITAL LETTER SHTAPIC */
$config['2c00_2c5f'][] = array('upper' => 11309, 'status' => 'C', 'lower' => array(11357)); /* GLAGOLITIC CAPITAL LETTER TROKUTASTI A */
$config['2c00_2c5f'][] = array('upper' => 11310, 'status' => 'C', 'lower' => array(11358)); /* GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE */
?>

View file

@ -47,4 +47,3 @@ $config['2c60_2c7f'][] = array('upper' => 11367, 'status' => 'C', 'lower' => arr
$config['2c60_2c7f'][] = array('upper' => 11369, 'status' => 'C', 'lower' => array(11370)); /* LATIN CAPITAL LETTER K WITH DESCENDER */
$config['2c60_2c7f'][] = array('upper' => 11371, 'status' => 'C', 'lower' => array(11372)); /* LATIN CAPITAL LETTER Z WITH DESCENDER */
$config['2c60_2c7f'][] = array('upper' => 11381, 'status' => 'C', 'lower' => array(11382)); /* LATIN CAPITAL LETTER HALF H */
?>

View file

@ -89,4 +89,3 @@ $config['2c80_2cff'][] = array('upper' => 11484, 'status' => 'C', 'lower' => arr
$config['2c80_2cff'][] = array('upper' => 11486, 'status' => 'C', 'lower' => array(11487)); /* COPTIC CAPITAL LETTER OLD NUBIAN NGI */
$config['2c80_2cff'][] = array('upper' => 11488, 'status' => 'C', 'lower' => array(11489)); /* COPTIC CAPITAL LETTER OLD NUBIAN NYI */
$config['2c80_2cff'][] = array('upper' => 11490, 'status' => 'C', 'lower' => array(11491)); /* COPTIC CAPITAL LETTER OLD NUBIAN WAU */
?>

View file

@ -65,4 +65,3 @@ $config['ff00_ffef'][] = array('upper' => 65335, 'status' => 'C', 'lower' => arr
$config['ff00_ffef'][] = array('upper' => 65336, 'status' => 'C', 'lower' => array(65368)); /* FULLWIDTH LATIN CAPITAL LETTER X */
$config['ff00_ffef'][] = array('upper' => 65337, 'status' => 'C', 'lower' => array(65369)); /* FULLWIDTH LATIN CAPITAL LETTER Y */
$config['ff00_ffef'][] = array('upper' => 65338, 'status' => 'C', 'lower' => array(65370)); /* FULLWIDTH LATIN CAPITAL LETTER Z */
?>

View file

@ -647,4 +647,3 @@ class ShellDispatcher {
if (!defined('DISABLE_AUTO_DISPATCH')) {
$dispatcher = new ShellDispatcher($argv);
}
?>

View file

@ -246,4 +246,3 @@ class ErrorHandler extends Object {
fwrite($this->stderr, "Error: ". $string . "\n");
}
}
?>

View file

@ -583,4 +583,3 @@ class AclShell extends Shell {
return $vars;
}
}
?>

View file

@ -208,4 +208,3 @@ class ApiShell extends Shell {
return $parsed;
}
}
?>

View file

@ -223,4 +223,3 @@ class BakeShell extends Shell {
$this->out();
}
}
?>

View file

@ -354,4 +354,3 @@ class ConsoleShell extends Shell {
return true;
}
}
?>

View file

@ -122,4 +122,3 @@ class I18nShell extends Shell {
$this->Extract->help();
}
}
?>

View file

@ -494,4 +494,3 @@ TEXT;
$this->_stop();
}
}
?>

View file

@ -620,4 +620,3 @@ class Shell extends Object {
return App::pluginPath($pluginName);
}
}
?>

View file

@ -56,4 +56,4 @@ class BakeTask extends Shell {
}
return $path;
}
}
}

View file

@ -468,4 +468,3 @@ class ControllerTask extends BakeTask {
$this->_stop();
}
}
?>

View file

@ -362,4 +362,3 @@ class DbConfigTask extends Shell {
return $useDbConfig;
}
}
?>

View file

@ -491,4 +491,3 @@ class ExtractTask extends Shell {
}
}
}
?>

View file

@ -410,4 +410,3 @@ class FixtureTask extends BakeTask {
$this->_stop();
}
}
?>

View file

@ -915,4 +915,3 @@ class ModelTask extends BakeTask {
$this->Fixture->bake($className, $useTable);
}
}
?>

View file

@ -244,4 +244,3 @@ class PluginTask extends Shell {
$this->_stop();
}
}
?>

View file

@ -361,4 +361,3 @@ class ProjectTask extends Shell {
}
}
?>

View file

@ -209,4 +209,3 @@ class TemplateTask extends Shell {
return false;
}
}
?>

View file

@ -438,4 +438,3 @@ class TestTask extends BakeTask {
$this->_stop();
}
}
?>

View file

@ -478,4 +478,3 @@ class ViewTask extends BakeTask {
return $associations;
}
}
?>

View file

@ -364,4 +364,3 @@ class TestSuiteShell extends Shell {
}
}
}
?>

View file

@ -32,4 +32,3 @@
*/
class AppController extends Controller {
}
?>

View file

@ -34,4 +34,3 @@ App::import('Helper', 'Helper', false);
*/
class AppHelper extends Helper {
}
?>

View file

@ -32,4 +32,3 @@
*/
class AppModel extends Model {
}
?>

View file

@ -48,4 +48,3 @@
* Inflector::rules('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
*
*/
?>

View file

@ -287,4 +287,3 @@
*
*/
Cache::config('default', array('engine' => 'File'));
?>

View file

@ -93,4 +93,3 @@ class DATABASE_CONFIG {
'prefix' => '',
);
}
?>

View file

@ -33,4 +33,3 @@
* ...and connect the rest of 'Pages' controller's urls.
*/
Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
?>

View file

@ -73,4 +73,3 @@ class DbAclSchema extends CakeSchema {
);
}
?>

View file

@ -50,4 +50,3 @@ class i18nSchema extends CakeSchema {
);
}
?>

View file

@ -47,4 +47,3 @@ class SessionsSchema extends CakeSchema {
);
}
?>

View file

@ -82,5 +82,3 @@ class PagesController extends AppController {
$this->render(implode('/', $path));
}
}
?>

View file

@ -16,4 +16,3 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
require 'webroot' . DIRECTORY_SEPARATOR . 'index.php';
?>

View file

@ -95,4 +95,3 @@ if (!class_exists('File')) {
header("Cache-Control: max-age=86400, must-revalidate"); // HTTP/1.1
header("Pragma: cache"); // HTTP/1.0
print $output;
?>

View file

@ -85,4 +85,3 @@
if (Configure::read() > 0) {
echo "<!-- " . round(microtime(true) - $TIME_START, 4) . "s -->";
}
?>

View file

@ -92,5 +92,3 @@ require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php';
$Dispatcher = new CakeTestSuiteDispatcher();
$Dispatcher->dispatch();
?>

View file

@ -414,6 +414,4 @@ class Dispatcher extends Object {
ob_end_flush();
}
}
}
?>

View file

@ -602,4 +602,3 @@ abstract class CacheEngine {
return $key;
}
}
?>

View file

@ -115,4 +115,3 @@ class ApcEngine extends CacheEngine {
}
}
?>

View file

@ -290,4 +290,3 @@ class FileEngine extends CacheEngine {
return true;
}
}
?>

View file

@ -194,4 +194,3 @@ class MemcacheEngine extends CacheEngine {
return true;
}
}
?>

View file

@ -175,4 +175,3 @@ class XcacheEngine extends CacheEngine {
}
}
}
?>

View file

@ -281,4 +281,3 @@ class CakeLog {
if (!defined('DISABLE_DEFAULT_ERROR_HANDLING')) {
set_error_handler(array('CakeLog', 'handleError'));
}
?>

View file

@ -790,4 +790,3 @@ class CakeSession extends Object {
return $return;
}
}
?>

View file

@ -289,4 +289,3 @@ class CakeSocket {
return true;
}
}
?>

View file

@ -361,4 +361,3 @@ class ClassRegistry {
$_this->__map = array();
}
}
?>

View file

@ -1261,4 +1261,3 @@ class App extends Object {
}
}
}
?>

View file

@ -34,4 +34,3 @@
*/
class AppController extends Controller {
}
?>

View file

@ -257,5 +257,3 @@ class Component extends Object {
}
}
}
?>

View file

@ -691,4 +691,3 @@ class IniAcl extends Object implements AclInterface {
return $array;
}
}
?>

View file

@ -926,4 +926,3 @@ class AuthComponent extends Object {
}
}
}
?>

View file

@ -463,4 +463,3 @@ class CookieComponent extends Object {
return $array;
}
}
?>

View file

@ -923,6 +923,4 @@ class EmailComponent extends Object{
}
return $fm;
}
}
?>

View file

@ -724,5 +724,3 @@ class RequestHandlerComponent extends Object {
$this->__typesInitialized = true;
}
}
?>

View file

@ -723,4 +723,3 @@ class SecurityComponent extends Object {
}
}
}
?>

View file

@ -281,5 +281,3 @@ class SessionComponent extends CakeSession {
return $this->started();
}
}
?>

View file

@ -1298,4 +1298,3 @@ class Controller extends Object {
return false;
}
}
?>

View file

@ -82,5 +82,3 @@ class PagesController extends AppController {
$this->render(implode('/', $path));
}
}
?>

View file

@ -602,4 +602,3 @@ class ScaffoldView extends ThemeView {
return $this->_missingView($paths[0] . $name . $this->ext, 'missingView');
}
}
?>

View file

@ -689,5 +689,3 @@ class Debugger {
if (!defined('DISABLE_DEFAULT_ERROR_HANDLING')) {
Debugger::invoke(Debugger::getInstance());
}
?>

View file

@ -440,4 +440,3 @@ class ErrorHandler extends Object {
echo $this->controller->output;
}
}
?>

View file

@ -512,4 +512,3 @@ class File {
return copy($this->path, $dest);
}
}
?>

View file

@ -759,4 +759,3 @@ class Folder {
return $lastChar === '/' || $lastChar === '\\';
}
}
?>

View file

@ -1040,4 +1040,3 @@ class HttpSocket extends CakeSocket {
return true;
}
}
?>

View file

@ -571,4 +571,3 @@ class I18n {
}
}
}
?>

View file

@ -619,4 +619,3 @@ class Inflector {
return preg_replace(array_keys($map), array_values($map), $string);
}
}
?>

View file

@ -480,4 +480,3 @@ class L10n {
return $this->__l10nCatalog;
}
}
?>

View file

@ -74,4 +74,4 @@ class FileLog implements CakeLogInterface {
return $log->append($output);
}
}
}
}

Some files were not shown because too many files have changed in this diff Show more