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

Exception handling when no core updates exist 

Fixes #2793
This commit is contained in:
Samuel Georges 2017-04-03 08:15:43 +10:00
parent 9475505369
commit 68f515ba0e
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/system/controllers/Updates.php
View File

@ -336,19 +336,21 @@ class Updates extends Controller
/* /*
* Core * Core
*/ */
$coreImportant = false; if (isset($result['core'])) {
$coreImportant = false;
foreach (array_get($result, 'core.updates', []) as $build => $description) { foreach (array_get($result, 'core.updates', []) as $build => $description) {
if (strpos($description, '!!!') === false) continue; if (strpos($description, '!!!') === false) continue;
$detailsUrl = '//octobercms.com/support/articles/release-notes'; $detailsUrl = '//octobercms.com/support/articles/release-notes';
$description = str_replace('!!!', '', $description); $description = str_replace('!!!', '', $description);
$result['core']['updates'][$build] = [$description, $detailsUrl]; $result['core']['updates'][$build] = [$description, $detailsUrl];
$coreImportant = $hasImportantUpdates = true; $coreImportant = $hasImportantUpdates = true;
}
$result['core']['isImportant'] = $coreImportant ? '1' : '0';
} }
$result['core']['isImportant'] = $coreImportant ? '1' : '0';
/* /*
* Plugins * Plugins
*/ */

4
modules/system/controllers/updates/_update_list.htm
View File

@ -30,7 +30,7 @@
</h5> </h5>
</div> </div>
<dl> <dl>
<?php foreach ($core['updates'] as $build => $description): ?> <?php foreach (array_get($core, 'updates', []) as $build => $description): ?>
<dt><?= e(trans('system::lang.updates.core_build', ['build'=>$build])) ?></dt> <dt><?= e(trans('system::lang.updates.core_build', ['build'=>$build])) ?></dt>
<?php if (is_array($description)): ?> <?php if (is_array($description)): ?>
<dd> <dd>
@ -104,7 +104,7 @@
<?= e(trans('system::lang.updates.plugin_version_none')) ?> <?= e(trans('system::lang.updates.plugin_version_none')) ?>
</dd> </dd>
<?php else: ?> <?php else: ?>
<?php foreach ($plugin['updates'] as $version => $description): ?> <?php foreach (array_get($plugin, 'updates', []) as $version => $description): ?>
<dt><?= e($version) ?></dt> <dt><?= e($version) ?></dt>
<?php if (is_array($description)): ?> <?php if (is_array($description)): ?>
<dd> <dd>