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

Fix exception message, remove some unneded imports.

This commit is contained in:
Pásztor Gábor 2016-12-07 21:33:05 +01:00
parent 78c64cf4a8
commit 94ab13cd8b
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/backend/widgets/form/partials/_field_dropdown.htm
View File

@ -24,9 +24,8 @@
<option
<?= $value == $field->value ? 'selected="selected"' : '' ?>
<?php if (isset($option[1])): ?>data-<?=strpos($option[1],'.')?'image':'icon'?>="<?= $option[1] ?>"<?php endif ?>
value="<?= $value ?>">
<?= e(trans($option[0])) ?>
</option>
value="<?= $value ?>"
><?= e(trans($option[0])) ?></option>
<?php endforeach ?>
</select>
<?php endif?>

2
modules/system/ServiceProvider.php
View File

@ -84,7 +84,7 @@ class ServiceProvider extends ModuleServiceProvider
/*
* Boot plugins
*/
$pluginManager = PluginManager::instance()->bootAll();
PluginManager::instance()->bootAll();
parent::boot('system');
}

3
modules/system/classes/ErrorHandler.php
View File

@ -6,11 +6,8 @@ use Config;
use Cms\Classes\Theme;
use Cms\Classes\Router;
use Cms\Classes\Controller;
use Cms\Classes\CmsException;
use October\Rain\Exception\ErrorHandler as ErrorHandlerBase;
use October\Rain\Exception\ApplicationException;
use Twig_Error_Runtime;
use Exception;
/**
* System Error Handler, this class handles application exception events.

2
modules/system/classes/MarkupManager.php
View File

@ -294,7 +294,7 @@ class MarkupManager
* Tests if a callable type contains a wildcard, also acts as a
* utility to replace the wildcard with a string.
* @param callable $callable
* @param string $replaceWith
* @param string|bool $replaceWith
* @return mixed
*/
protected function isWildCallable($callable, $replaceWith = false)

6
modules/system/classes/PluginBase.php
View File

@ -49,7 +49,9 @@ class PluginBase extends ServiceProviderBase
'method in the plugin class.', $thisClass));
if (!array_key_exists('plugin', $configuration)) {
throw new SystemException(sprintf('The plugin configuration file plugin.yaml should contain the "plugin" section: %s.', $thisClass));
throw new SystemException(sprintf(
'The plugin configuration file plugin.yaml should contain the "plugin" section: %s.', $thisClass)
);
}
return $configuration['plugin'];
@ -247,7 +249,7 @@ class PluginBase extends ServiceProviderBase
else {
$this->loadedYamlConfiguration = Yaml::parse(file_get_contents($yamlFilePath));
if (!is_array($this->loadedYamlConfiguration)) {
throw new SystemException('Invalid format of the plugin configuration file: %s. The file should define an array.', $yamlFilePath);
throw new SystemException(sprintf('Invalid format of the plugin configuration file: %s. The file should define an array.', $yamlFilePath));
}
}