Merge branch '2.0' into 2.0-request

Conflicts:
	cake/libs/router.php
	cake/tests/cases/libs/router.test.php

app/config/bootstrap.php

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

app/config/core.php

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

app/config/database.php.default

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

app/config/routes.php

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

app/config/schema/db_acl.php

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

app/config/schema/i18n.php

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

app/config/schema/sessions.php

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

app/index.php

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

app/webroot/css.php

@@ -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;
-?>

app/webroot/index.php

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

app/webroot/test.php

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

cake/basics.php

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

cake/bootstrap.php

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

cake/config/config.php

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

cake/config/paths.php

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

cake/config/unicode/casefolding/0080_00ff.php

@@ -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 */
-?>

cake/config/unicode/casefolding/0100_017f.php

@@ -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 */
-?>

cake/config/unicode/casefolding/0180_024F.php

@@ -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 */
-?>

cake/config/unicode/casefolding/0250_02af.php

@@ -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));
-?>

cake/config/unicode/casefolding/0370_03ff.php

@@ -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 */
-?>

cake/config/unicode/casefolding/0400_04ff.php

@@ -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 */
-?>

cake/config/unicode/casefolding/0500_052f.php

@@ -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 */
-?>

cake/config/unicode/casefolding/0530_058f.php

@@ -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 */
-?>

cake/config/unicode/casefolding/1e00_1eff.php

@@ -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 */
-?>

cake/config/unicode/casefolding/1f00_1fff.php

@@ -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 */
-?>

cake/config/unicode/casefolding/2100_214f.php

@@ -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 */
-?>

cake/config/unicode/casefolding/2150_218f.php

@@ -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 */
-?>

cake/config/unicode/casefolding/2460_24ff.php

@@ -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 */
-?>

cake/config/unicode/casefolding/2c00_2c5f.php

@@ -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 */
-?>

cake/config/unicode/casefolding/2c60_2c7f.php

@@ -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 */
-?>

cake/config/unicode/casefolding/2c80_2cff.php

@@ -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 */
-?>

cake/config/unicode/casefolding/ff00_ffef.php

@@ -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 */
-?>

cake/console/cake.php

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

cake/console/error.php

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

cake/console/libs/acl.php

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

cake/console/libs/api.php

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

cake/console/libs/bake.php

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

cake/console/libs/console.php

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

cake/console/libs/i18n.php

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

cake/console/libs/schema.php

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

cake/console/libs/shell.php

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

cake/console/libs/tasks/controller.php

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

cake/console/libs/tasks/db_config.php

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

cake/console/libs/tasks/extract.php

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

cake/console/libs/tasks/fixture.php

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

cake/console/libs/tasks/model.php

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

cake/console/libs/tasks/plugin.php

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

cake/console/libs/tasks/project.php

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

cake/console/libs/tasks/template.php

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

cake/console/libs/tasks/test.php

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

cake/console/libs/tasks/view.php

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

cake/console/libs/testsuite.php

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

cake/console/templates/skel/app_controller.php

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

cake/console/templates/skel/app_helper.php

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

cake/console/templates/skel/app_model.php

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

cake/console/templates/skel/config/bootstrap.php

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

cake/console/templates/skel/config/core.php

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

cake/console/templates/skel/config/database.php.default

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

cake/console/templates/skel/config/routes.php

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

cake/console/templates/skel/config/schema/db_acl.php

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

cake/console/templates/skel/config/schema/i18n.php

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

cake/console/templates/skel/config/schema/sessions.php

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

cake/console/templates/skel/controllers/pages_controller.php

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

cake/console/templates/skel/index.php

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

cake/console/templates/skel/webroot/css.php

@@ -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;
-?>

cake/console/templates/skel/webroot/index.php

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

cake/console/templates/skel/webroot/test.php

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

cake/dispatcher.php

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

cake/libs/cache.php

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

cake/libs/cache/apc.php

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

cake/libs/cache/file.php

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

cake/libs/cache/memcache.php

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

cake/libs/cache/xcache.php

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

cake/libs/cake_log.php

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

cake/libs/cake_session.php

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

cake/libs/cake_socket.php

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

cake/libs/class_registry.php

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

cake/libs/configure.php

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

cake/libs/controller/app_controller.php

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

cake/libs/controller/component.php

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

cake/libs/controller/components/acl.php

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

cake/libs/controller/components/auth.php

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

cake/libs/controller/components/cookie.php

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

cake/libs/controller/components/email.php

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

cake/libs/controller/components/request_handler.php

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

cake/libs/controller/components/security.php

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

cake/libs/controller/components/session.php

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

cake/libs/controller/controller.php

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

cake/libs/controller/pages_controller.php

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

cake/libs/controller/scaffold.php

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

cake/libs/debugger.php

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

cake/libs/error.php

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

cake/libs/file.php

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

cake/libs/folder.php

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

cake/libs/http_socket.php

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

cake/libs/i18n.php

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

cake/libs/inflector.php

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

cake/libs/l10n.php

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

cake/libs/magic_db.php

@@ -292,5 +292,3 @@ class MagicFileResource extends Object{
 		}
 	}
 }
-
-?>

cake/libs/model/app_model.php

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