diff --git a/CHANGELOG.md b/CHANGELOG.md index ed00ab737..b662a7d5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +* **Build 15x** (2014-10-x) + - Fixes an issue where new Themes attached to a project were not being installed on update. + - Fixes issue where XDebug aborts the thread for maximum function count. + * **Build 155** (2014-10-16) - Back-end area can now be customized with colors and logo, via System > Customize Back-end. - Added twig filters `|trans` for `Lang::get(...)` and `|transchoice` for `Lang::choice(...)`. diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php index 0c8fd3761..3ae9f728c 100644 --- a/modules/system/classes/UpdateManager.php +++ b/modules/system/classes/UpdateManager.php @@ -221,6 +221,12 @@ class UpdateManager } $result['themes'] = $themes; + /* + * There are updates if update count is empty + * or if uninstalled themes are found. + */ + $result['hasUpdates'] = array_get($result, 'update') || count($themes); + Parameters::set('system::update.count', array_get($result, 'update', 0)); return $result; diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php index 6d795a065..f4529a195 100644 --- a/modules/system/controllers/Updates.php +++ b/modules/system/controllers/Updates.php @@ -176,7 +176,7 @@ class Updates extends Controller $result = $manager->requestUpdateList(); $this->vars['core'] = array_get($result, 'core', false); - $this->vars['hasUpdates'] = array_get($result, 'update', false); + $this->vars['hasUpdates'] = array_get($result, 'hasUpdates', false); $this->vars['pluginList'] = array_get($result, 'plugins', []); $this->vars['themeList'] = array_get($result, 'themes', []); } catch (Exception $ex) {