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

Various fixes

This commit is contained in:
Samuel Georges 2015-02-12 21:04:05 +11:00
parent e50a220fae
commit 3d04f06ad1
7 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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. - **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). - 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. - Popup control now supports several sizes via `data-size` attribute: giant, huge, large, small, tiny.

2
config/app.php
View File

@ -81,7 +81,7 @@ return array(
| |
*/ */
'key' => 'CHANGE_ME!!!', 'key' => 'CHANGE_ME!!!!!!!',
'cipher' => MCRYPT_RIJNDAEL_128, 'cipher' => MCRYPT_RIJNDAEL_128,

2
modules/cms/classes/CmsException.php
View File

@ -153,7 +153,7 @@ class CmsException extends ApplicationException
$check = true; $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')) { if (strpos($exception->getFile(), $this->compoundObject->getFileName() . '.php')) {
$check = true; $check = true;
} }

4
modules/cms/views/404.php
View File

@ -3,8 +3,8 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title><?= Lang::get('cms::lang.page.not_found.label') ?></title> <title><?= Lang::get('cms::lang.page.not_found.label') ?></title>
<link href="<?= URL::to('/modules/system/assets/vendor/font-autumn/css/font-autumn.css') ?>" rel="stylesheet"> <link href="<?= Url::asset('/modules/system/assets/vendor/font-autumn/css/font-autumn.css') ?>" rel="stylesheet">
<link href="<?= URL::to('/modules/system/assets/css/styles.css') ?>" rel="stylesheet"> <link href="<?= Url::asset('/modules/system/assets/css/styles.css') ?>" rel="stylesheet">
</head> </head>
<body> <body>
<div class="container"> <div class="container">

4
modules/cms/views/error.php
View File

@ -3,8 +3,8 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title><?= Lang::get('cms::lang.page.custom_error.label') ?></title> <title><?= Lang::get('cms::lang.page.custom_error.label') ?></title>
<link href="<?= URL::to('/modules/system/assets/vendor/font-autumn/css/font-autumn.css') ?>" rel="stylesheet"> <link href="<?= Url::asset('/modules/system/assets/vendor/font-autumn/css/font-autumn.css') ?>" rel="stylesheet">
<link href="<?= URL::to('/modules/system/assets/css/styles.css') ?>" rel="stylesheet"> <link href="<?= Url::asset('/modules/system/assets/css/styles.css') ?>" rel="stylesheet">
</head> </head>
<body> <body>
<div class="container"> <div class="container">

12
modules/system/ServiceProvider.php
View File

@ -77,12 +77,10 @@ class ServiceProvider extends ModuleServiceProvider
*/ */
Event::listen('console.schedule', function($schedule) use ($pluginManager) { Event::listen('console.schedule', function($schedule) use ($pluginManager) {
foreach ($pluginManager->getPlugins() as $plugin) { foreach ($pluginManager->getPlugins() as $plugin) {
if (!method_exists($plugin, 'registerSchedule')) { if (method_exists($plugin, 'registerSchedule')) {
continue;
}
$plugin->registerSchedule($schedule); $plugin->registerSchedule($schedule);
} }
}
}); });
/* /*
@ -97,11 +95,9 @@ class ServiceProvider extends ModuleServiceProvider
* Write all log events to the database * Write all log events to the database
*/ */
Event::listen('illuminate.log', function ($level, $message, $context) { Event::listen('illuminate.log', function ($level, $message, $context) {
if (!DbDongle::hasDatabase() || defined('OCTOBER_NO_EVENT_LOGGING')) { if (DbDongle::hasDatabase() && !defined('OCTOBER_NO_EVENT_LOGGING')) {
return;
}
EventLog::add($message, $level); EventLog::add($message, $level);
}
}); });
/* /*

12
modules/system/views/exception.php
View File

@ -3,12 +3,12 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Exception</title> <title>Exception</title>
<link href="<?= URL::to('/modules/system/assets/vendor/font-autumn/css/font-autumn.css') ?>" rel="stylesheet"> <link href="<?= Url::asset('/modules/system/assets/vendor/font-autumn/css/font-autumn.css') ?>" rel="stylesheet">
<link href="<?= URL::to('/modules/system/assets/css/styles.css') ?>" rel="stylesheet"> <link href="<?= Url::asset('/modules/system/assets/css/styles.css') ?>" rel="stylesheet">
<script src="<?= URL::to('/modules/system/assets/vendor/syntaxhighlighter/scripts/shCore.js') ?>"></script> <script src="<?= Url::asset('/modules/system/assets/vendor/syntaxhighlighter/scripts/shCore.js') ?>"></script>
<script src="<?= URL::to('/modules/system/assets/vendor/syntaxhighlighter/scripts/shBrushPhp.js') ?>"></script> <script src="<?= Url::asset('/modules/system/assets/vendor/syntaxhighlighter/scripts/shBrushPhp.js') ?>"></script>
<script src="<?= URL::to('/modules/system/assets/vendor/syntaxhighlighter/scripts/shBrushXml.js') ?>"></script> <script src="<?= Url::asset('/modules/system/assets/vendor/syntaxhighlighter/scripts/shBrushXml.js') ?>"></script>
<link href="<?= URL::to('/modules/system/assets/vendor/syntaxhighlighter/styles/shCore.css') ?>"> <link href="<?= Url::asset('/modules/system/assets/vendor/syntaxhighlighter/styles/shCore.css') ?>">
</head> </head>
<body> <body>
<div class="container"> <div class="container">