Skip to content

use DIRECTORY_SEPARATOR everywhere #710

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

Closed
crtlib wants to merge 1 commit into from
Closed

use DIRECTORY_SEPARATOR everywhere #710

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
8 changes: 4 additions & 4 deletions framework/yii/base/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,10 +449,10 @@ public function handleError($code, $message, $file, $line)
// load ErrorException manually here because autoloading them will not work
// when error occurs while autoloading a class
if (!class_exists('\\yii\\base\\Exception', false)) {
require_once(__DIR__ . '/Exception.php');
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'Exception.php');
}
if (!class_exists('\\yii\\base\\ErrorException', false)) {
require_once(__DIR__ . '/ErrorException.php');
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'ErrorException.php');
}
$exception = new ErrorException($message, $code, $code, $file, $line);

Expand All @@ -478,10 +478,10 @@ public function handleFatalError()
// load ErrorException manually here because autoloading them will not work
// when error occurs while autoloading a class
if (!class_exists('\\yii\\base\\Exception', false)) {
require_once(__DIR__ . '/Exception.php');
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'Exception.php');
}
if (!class_exists('\\yii\\base\\ErrorException', false)) {
require_once(__DIR__ . '/ErrorException.php');
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'ErrorException.php');
}

$error = error_get_last();
Expand Down