diff --git a/modules/system/assets/js/updates/updates.js b/modules/system/assets/js/updates/updates.js index 9665c60e3..95a415430 100644 --- a/modules/system/assets/js/updates/updates.js +++ b/modules/system/assets/js/updates/updates.js @@ -99,11 +99,13 @@ $.each(steps, function(index, step){ - if (step == fromStep) + if (step == fromStep) { skipStep = false + } - if (skipStep) + if (skipStep) { return true // Continue + } eventChain.push(function(){ var deferred = $.Deferred() @@ -152,8 +154,4 @@ $.oc.updateProcess = new UpdateProcess; - // $(document).ready(function(){ - // new $oc.updateProcess - // }) - -}(window.jQuery); \ No newline at end of file +}(window.jQuery); diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php index de8c5c823..43cb03a21 100644 --- a/modules/system/classes/UpdateManager.php +++ b/modules/system/classes/UpdateManager.php @@ -311,8 +311,7 @@ class UpdateManager */ public function requestProjectDetails($projectId) { - $result = $this->requestServerData('project/detail', ['id' => $projectId]); - return $result; + return $this->requestServerData('project/detail', ['id' => $projectId]); } /** @@ -471,8 +470,7 @@ class UpdateManager */ public function requestPluginDetails($name) { - $result = $this->requestServerData('plugin/detail', ['name' => $name]); - return $result; + return $this->requestServerData('plugin/detail', ['name' => $name]); } /** @@ -482,8 +480,7 @@ class UpdateManager */ public function requestPluginContent($name) { - $result = $this->requestServerData('plugin/content', ['name' => $name]); - return $result; + return $this->requestServerData('plugin/content', ['name' => $name]); } /** @@ -538,6 +535,7 @@ class UpdateManager } $this->note('Unable to find: ' . $name); + return $this; } @@ -579,8 +577,7 @@ class UpdateManager */ public function requestThemeDetails($name) { - $result = $this->requestServerData('theme/detail', ['name' => $name]); - return $result; + return $this->requestServerData('theme/detail', ['name' => $name]); } /** @@ -592,6 +589,7 @@ class UpdateManager public function downloadTheme($name, $hash) { $fileCode = $name . $hash; + $this->requestServerFile('theme/get', $fileCode, $hash, ['name' => $name]); } @@ -620,8 +618,9 @@ class UpdateManager public function requestProductDetails($codes, $type = null) { - if ($type != 'plugin' && $type != 'theme') + if ($type != 'plugin' && $type != 'theme') { $type = 'plugin'; + } $codes = (array) $codes; $this->loadProductDetailCache(); @@ -669,8 +668,9 @@ class UpdateManager */ public function requestPopularProducts($type = null) { - if ($type != 'plugin' && $type != 'theme') + if ($type != 'plugin' && $type != 'theme') { $type = 'plugin'; + } $cacheKey = 'system-updates-popular-'.$type;