php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-18 07:20:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2811 from dmeroff/theme_enhancements

Browse Source 
Made Theme::basePath optional fixes #2810
This commit is contained in:
Qiang Xue
2014-03-19 09:28:35 -04:00
parent 30d84ffbe3 0fa8f8cc01
commit 62fae9c15a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
framework/base/Theme.php
View File

@@ -82,12 +82,11 @@ class Theme extends Component
{
parent::init();
if (($basePath = $this->getBasePath()) !== null) {
if (empty($this->pathMap)) {
$this->pathMap = [Yii::$app->getBasePath() => [$basePath]];
if (empty($this->pathMap)) {
if (($basePath = $this->getBasePath()) == null) {
throw new InvalidConfigException('The "basePath" property must be set.');
}
} else {
throw new InvalidConfigException('The "basePath" property must be set.');
$this->pathMap = [Yii::$app->getBasePath() => [$basePath]];
}
}
@@ -173,13 +172,18 @@ class Theme extends Component
}
}
/**
* Converts a relative file path into an absolute one using [[basePath]].
* @param string $path the relative file path to be converted.
* @param string $path the relative file path to be converted.
* @return string the absolute file path
*/
public function getPath($path)
{
return $this->getBasePath() . DIRECTORY_SEPARATOR . ltrim($path, '/\\');
if (($basePath = $this->getBasePath()) !== null) {
return $basePath . DIRECTORY_SEPARATOR . ltrim($path, '/\\');
} else {
throw new InvalidConfigException('The "basePath" property must be set.');
}
}
}