Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EZP-26680 INI Cache files are generated with wrong filepaths #1269

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

EZP-26680 INI Cache files are generated with wrong filepaths #1269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/ezutils/classes/ezini.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,26 +482,26 @@ function findInputFiles( &$inputFiles, &$iniFile )
else
$overrideFile = eZDir::path( array( $rootDir, $overrideDir, $fileName ) );

if ( file_exists( $overrideFile . '.php' ) )
if ( file_exists( __DIR__ . '/../../../' . $overrideFile . '.php' ) )
{
// recursion eZDebug::writeStrict( "INI files with *.ini.php suffix is DEPRECATED, use *.ini or *.ini.append.php instead: $overrideFile.php", __METHOD__ );
$inputFiles[] = $overrideFile . '.php';
$inputFiles[] = __DIR__ . '/../../../' . $overrideFile . '.php';
}

if ( file_exists( $overrideFile ) )
if ( file_exists( __DIR__ . '/../../../' . $overrideFile ) )
{
$inputFiles[] = $overrideFile;
$inputFiles[] = __DIR__ . '/../../../' . $overrideFile;
}

if ( file_exists( $overrideFile . '.append.php' ) )
if ( file_exists( __DIR__ . '/../../../' . $overrideFile . '.append.php' ) )
{
$inputFiles[] = $overrideFile . '.append.php';
$inputFiles[] = __DIR__ . '/../../../' . $overrideFile . '.append.php';
}

if ( file_exists( $overrideFile . '.append' ) )
if ( file_exists( __DIR__ . '/../../../' . $overrideFile . '.append' ) )
{
// recursion eZDebug::writeStrict( "INI files with *.ini.append suffix is DEPRECATED, use *.ini or *.ini.append.php instead: $overrideFile.append", __METHOD__ );
$inputFiles[] = $overrideFile . '.append';
$inputFiles[] = __DIR__ . '/../../../' . $overrideFile . '.append';
}
}
}
Expand Down