Merge "Adjusting upgrade check in admin/cli/upgrade.php (Bug #1394758)"

htdocs/admin/cli/upgrade.php

@@ -38,7 +38,7 @@ if (!table_exists(new XMLDBTable('config'))) {
 
 // Check whether we need to do anything
 $upgrades = check_upgrades();
-if (!$upgrades) {
+if (empty($upgrades['settings']['toupgradecount'])) {
     cli::cli_exit(get_string('noupgrades', 'admin'), false);
 }