Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-22 06:28:03 +01:00
Code Issues Packages Projects Releases Activity

Moved to camels for plugins+themes as optional class naming type

Browse Source
This commit is contained in:
Andy Miller
2015-02-02 13:08:56 -07:00
parent f0585ddb4e
commit a3c848e4e2
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/src/Grav/Common/Plugins.php
View File

@@ -54,7 +54,7 @@ class Plugins extends Iterator
$pluginClassFormat = [
'Grav\\Plugin\\'.ucfirst($plugin).'Plugin',
'Grav\\Plugin\\'.str_replace(['_','-'], '', $plugin).'Plugin'
'Grav\\Plugin\\'.Inflector::camelize($plugin).'Plugin'
];
$pluginClassName = false;

15
system/src/Grav/Common/Themes.php
View File

@@ -145,10 +145,19 @@ class Themes extends Iterator
$class = include $file;
if (!is_object($class)) {
$className = '\\Grav\\Theme\\' . ucfirst($name);
if (class_exists($className)) {
$class = new $className($grav, $config, $name);
$themeClassFormat = [
'Grav\\Theme\\'.ucfirst($name),
'Grav\\Theme\\'.Inflector::camelize($name)
];
$themeClassName = false;
foreach ($themeClassFormat as $themeClass) {
if (class_exists($themeClass)) {
$themeClassName = $themeClass;
$class = new $themeClassName($grav, $config, $name);
break;
}
}
}
} elseif (!$locator('theme://') && !defined('GRAV_CLI')) {