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

Merge pull request #458 from octobercms/develop 

* Build 126
This commit is contained in:
Samuel Georges 2014-07-24 21:14:43 +10:00
parent 61fcd5fd76 9067d20048
commit 211d8147cd
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/cms/classes/Controller.php
View File

@ -400,7 +400,14 @@ class Controller extends BaseController
return Response::make($responseContents, 406);
}
catch (Exception $ex) {
return Response::make($ex->getMessage(), 500);
/*
* Display a "dumbed down" error if custom page is activated
* otherwise display a more detailed error.
*/
if (Config::get('cms.customErrorPage', false))
return Response::make($ex->getMessage(), 500);
return Response::make(sprintf('"%s" on line %s of %s', $ex->getMessage(), $ex->getLine(), $ex->getFile()), 500);
}
}

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

@ -195,10 +195,16 @@ class Updates extends Controller
$plugins[$code] = array_get($plugin, 'hash', null);
}
$themes = [];
$themeList = array_get($result, 'themes', []);
foreach ($themeList as $code => $theme) {
$themes[$code] = array_get($theme, 'hash', null);
}
/*
* Update steps
*/
$updateSteps = $this->buildUpdateSteps($core, $plugins);
$updateSteps = $this->buildUpdateSteps($core, $plugins, $themes);
/*
* Finish up

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

@ -16,7 +16,7 @@
<i class="icon-cube"></i>
<?= e(trans('system::lang.system.name')) ?>
<?php if ($core['old_build']): ?>
<?= e(trans('system::lang.updates.core_build_old', ['build'=>$core['old_build']])) ?>
<small><?= e(trans('system::lang.updates.core_build_old', ['build'=>$core['old_build']])) ?></small>
<?php endif ?>
</h5>
<dl>