From e937c5456e8fe5e3ae5323f371629fa0c42c42cd Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Wed, 30 May 2012 10:32:48 +0200 Subject: [PATCH] MDL-32329 fixed missing phpdoc and improved coding style Credit goes to Aparup Banerjee for spotting this during the integration review. --- admin/renderer.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/admin/renderer.php b/admin/renderer.php index d3ac14c6da2..9b689a6903e 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -112,6 +112,7 @@ class core_admin_renderer extends plugin_renderer_base { * * @param double|string|int $version Moodle on-disk version * @param array $failed list of plugins with unsatisfied dependecies + * @param moodle_url $reloadurl URL of the page to recheck the dependencies * @return string HTML */ public function unsatisfied_dependencies_page($version, array $failed, moodle_url $reloadurl) { @@ -682,8 +683,10 @@ class core_admin_renderer extends plugin_renderer_base { $statusisboring = in_array($statuscode, array( plugin_manager::PLUGIN_STATUS_NODB, plugin_manager::PLUGIN_STATUS_UPTODATE)); - $dependenciesok = $pluginman->are_dependencies_satisfied( - $plugin->get_other_required_plugins()) && $plugin->is_core_dependency_satisfied($version); + + $coredependency = $plugin->is_core_dependency_satisfied($version); + $otherpluginsdependencies = $pluginman->are_dependencies_satisfied($plugin->get_other_required_plugins()); + $dependenciesok = $coredependency && $otherpluginsdependencies; if ($options['xdep']) { // we want to see only plugins with failed dependencies -- 2.17.1