Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
b3053f43
Commit
b3053f43
authored
Mar 19, 2014
by
Dmitry Erofeev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made Theme::basePath optional fixes #2810
parent
30d84ffb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
14 deletions
+3
-14
Theme.php
framework/base/Theme.php
+3
-14
No files found.
framework/base/Theme.php
View file @
b3053f43
...
@@ -82,13 +82,12 @@ class Theme extends Component
...
@@ -82,13 +82,12 @@ class Theme extends Component
{
{
parent
::
init
();
parent
::
init
();
if
((
$basePath
=
$this
->
getBasePath
())
!==
null
)
{
if
(
empty
(
$this
->
pathMap
))
{
if
(
empty
(
$this
->
pathMap
))
{
$this
->
pathMap
=
[
Yii
::
$app
->
getBasePath
()
=>
[
$basePath
]];
if
((
$basePath
=
$this
->
getBasePath
())
==
null
)
{
}
}
else
{
throw
new
InvalidConfigException
(
'The "basePath" property must be set.'
);
throw
new
InvalidConfigException
(
'The "basePath" property must be set.'
);
}
}
$this
->
pathMap
=
[
Yii
::
$app
->
getBasePath
()
=>
[
$basePath
]];
}
}
}
private
$_baseUrl
;
private
$_baseUrl
;
...
@@ -172,14 +171,4 @@ class Theme extends Component
...
@@ -172,14 +171,4 @@ class Theme extends Component
throw
new
InvalidConfigException
(
'The "baseUrl" property must be set.'
);
throw
new
InvalidConfigException
(
'The "baseUrl" property must be set.'
);
}
}
}
}
/**
* Converts a relative file path into an absolute one using [[basePath]].
* @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
,
'/\\'
);
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment