diff --git a/CHANGELOG.md b/CHANGELOG.md index d012bb1d5..8e74d9ae6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -* **Build 187** (2015-03-31) +* **Build 187** (2015-02-12) - **Upgraded framework to Laravel version 5**, see the [end of beta page](http://octobercms.com/beta#advanced-upgrade) for information on how to upgrade. - Introduced a linking policy to control the way URLs are generated globally (see config cms.linkPolicy). - Popup control now supports several sizes via `data-size` attribute: giant, huge, large, small, tiny. diff --git a/config/app.php b/config/app.php index 53b4e5c89..ae1cd12a8 100644 --- a/config/app.php +++ b/config/app.php @@ -81,7 +81,7 @@ return array( | */ - 'key' => 'CHANGE_ME!!!', + 'key' => 'CHANGE_ME!!!!!!!', 'cipher' => MCRYPT_RIJNDAEL_128, diff --git a/modules/cms/classes/CmsException.php b/modules/cms/classes/CmsException.php index a4b9272f8..e5d9b6853 100644 --- a/modules/cms/classes/CmsException.php +++ b/modules/cms/classes/CmsException.php @@ -153,7 +153,7 @@ class CmsException extends ApplicationException $check = true; } - // Expected: */app/storage/cache/39/05/home.htm.php + // Expected: */storage/cms/cache/39/05/home.htm.php if (strpos($exception->getFile(), $this->compoundObject->getFileName() . '.php')) { $check = true; } diff --git a/modules/cms/views/404.php b/modules/cms/views/404.php index a075ab596..54497a613 100644 --- a/modules/cms/views/404.php +++ b/modules/cms/views/404.php @@ -3,8 +3,8 @@ <?= Lang::get('cms::lang.page.not_found.label') ?> - - + +
diff --git a/modules/cms/views/error.php b/modules/cms/views/error.php index 6d469a518..12ad5ac0b 100644 --- a/modules/cms/views/error.php +++ b/modules/cms/views/error.php @@ -3,8 +3,8 @@ <?= Lang::get('cms::lang.page.custom_error.label') ?> - - + +
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php index b2f1a65dc..58ee472de 100644 --- a/modules/system/ServiceProvider.php +++ b/modules/system/ServiceProvider.php @@ -77,11 +77,9 @@ class ServiceProvider extends ModuleServiceProvider */ Event::listen('console.schedule', function($schedule) use ($pluginManager) { foreach ($pluginManager->getPlugins() as $plugin) { - if (!method_exists($plugin, 'registerSchedule')) { - continue; + if (method_exists($plugin, 'registerSchedule')) { + $plugin->registerSchedule($schedule); } - - $plugin->registerSchedule($schedule); } }); @@ -97,11 +95,9 @@ class ServiceProvider extends ModuleServiceProvider * Write all log events to the database */ Event::listen('illuminate.log', function ($level, $message, $context) { - if (!DbDongle::hasDatabase() || defined('OCTOBER_NO_EVENT_LOGGING')) { - return; + if (DbDongle::hasDatabase() && !defined('OCTOBER_NO_EVENT_LOGGING')) { + EventLog::add($message, $level); } - - EventLog::add($message, $level); }); /* diff --git a/modules/system/views/exception.php b/modules/system/views/exception.php index 3b8606e55..17a769b70 100644 --- a/modules/system/views/exception.php +++ b/modules/system/views/exception.php @@ -3,12 +3,12 @@ Exception - - - - - - + + + + + +