TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewind DI to prevent double up bug

This commit is contained in:
Sam Georges 2014-07-19 16:09:44 +10:00
parent a43f4f6b51
commit 15b93c7b03
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/cms/classes/Theme.php
View File

@ -68,7 +68,7 @@ class Theme
*/
public static function exists($dirName)
{
$theme = new self;
$theme = new static;
$path = $theme->getPath($dirName);
return File::isDirectory($path);
@ -112,7 +112,7 @@ class Theme
if (!strlen($activeTheme))
throw new SystemException(Lang::get('cms::lang.theme.active.not_set'));
$theme = new self();
$theme = new static;
$theme->load($activeTheme);
if (!File::isDirectory($theme->getPath()))
return null;
@ -154,7 +154,7 @@ class Theme
if (!strlen($editTheme))
throw new SystemException(Lang::get('cms::lang.theme.edit.not_set'));
$theme = new self();
$theme = new static;
$theme->load($editTheme);
if (!File::isDirectory($theme->getPath()))
return null;
@ -171,17 +171,16 @@ class Theme
$path = base_path().Config::get('cms.themesDir');
$it = new DirectoryIterator($path);
$it->rewind();
$result = [];
foreach ($it as $fileinfo) {
if ($fileinfo->isDot() ||(substr($fileinfo->getFilename(), 0, 1) == '.'))
if ($fileinfo->isDot() || (substr($fileinfo->getFilename(), 0, 1) == '.'))
continue;
$theme = new self();
$theme = new static;
$theme->load($fileinfo->getFilename());
$result[] = $theme;
}
return $result;

2
tests/unit/cms/classes/ThemeTest.php
View File

@ -17,7 +17,7 @@ class ThemeTest extends TestCase
$it->setMaxDepth(1);
$it->rewind();
while($it->valid()) {
while ($it->valid()) {
if (!$it->isDot() && !$it->isDir() && $it->getExtension() == 'htm')
$result++;