adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Renan Gonçalves 2011-06-12 23:25:01 +02:00
commit dfe58d7851
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Config/acl.ini.php
View file

@ -1,12 +1,12 @@
;<?php die() ?>
;<?php exit() ?>
; SVN FILE: $Id$
;/**
; * ACL configuration
; * ACL Configuration
; *
; *
; * PHP 5
; *
; * CakePHP(tm) : Rapid Development Framework http://cakephp.org
; * CakePHP(tm) : Rapid Development Framework http://www.cakephp.org/
; * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
; *
; * Licensed under The MIT License
@ -66,4 +66,4 @@ allow = aco3, aco4
[groupname-goes-here]
deny = aco5, aco6
allow = aco7, aco8
allow = aco7, aco8

3
lib/Cake/Console/Templates/skel/Config/core.php
View file

@ -287,7 +287,7 @@
/**
* Pick the caching engine to use. If APC is enabled use it.
* If running via cli - apc is disabled by default. ensure it's avaiable and enabled in this case
* If running via cli - apc is disabled by default. ensure it's available and enabled in this case
*
*/
$engine = 'File';
@ -324,4 +324,3 @@ Cache::config('_cake_model_', array(
'serialize' => ($engine === 'File'),
'duration' => $duration
));

6
lib/Cake/Console/Templates/skel/webroot/test.php
View file

@ -45,11 +45,11 @@ ini_set('display_errors', 1);
define('APP_DIR', basename(dirname(dirname(__FILE__))));
}
/**
* The absolute path to the "cake" directory, WITHOUT a trailing DS.
* The absolute path to the "Cake" directory, WITHOUT a trailing DS.
*
*/
if (!defined('CAKE_CORE_INCLUDE_PATH')) {
define('CAKE_CORE_INCLUDE_PATH', ROOT);
define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
}
/**
@ -72,7 +72,7 @@ if (!include(CORE_PATH . 'Cake' . DS . 'bootstrap.php')) {
}
if (Configure::read('debug') < 1) {
die(__('Debug setting does not allow access to this url.'));
die(__d('cake', 'Debug setting does not allow access to this url.'));
}
require_once CAKE . 'TestSuite' . DS . 'CakeTestSuiteDispatcher.php';