adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-06 19:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'origin/2.0' into 2.0-class-loading

Browse source 
Conflicts:
	lib/Cake/config/ini_file.php
This commit is contained in:
José Lorenzo Rodríguez 2010-12-06 09:42:52 -04:30
commit 5dddb362ec
24 changed files with 568 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Controller/Component/AclComponent.php
View file

@ -662,9 +662,9 @@ class IniAcl extends Object implements AclInterface {
* @return array INI section structure
*/
public function readConfigFile($filename) {
App::import('Core', 'config/IniFile');
$iniFile = new IniFile($filename);
return $iniFile->asArray();
App::import('Core', 'config/IniReader');
$iniFile = new IniReader(dirname($filename) . DS);
return $iniFile->read(basename($filename));
}
/**