summaryrefslogtreecommitdiff
path: root/update.php
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-10-24 18:47:02 +0000
committerDries Buytaert <dries@buytaert.net>2008-10-24 18:47:02 +0000
commit74a7badf6947617b40c52fa19aa84a1e0dcb533f (patch)
tree21daf14d4f5c5469aa7f20906b82f4358a0cc7d2 /update.php
parent1f4311f4b5e3271551cdb82f8507dfe2ef641fa2 (diff)
downloadbrdo-74a7badf6947617b40c52fa19aa84a1e0dcb533f.tar.gz
brdo-74a7badf6947617b40c52fa19aa84a1e0dcb533f.tar.bz2
- Patch #325426 by moshe: correct count in update.php.
Diffstat (limited to 'update.php')
-rw-r--r--update.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/update.php b/update.php
index 98578eb17..0a0dc2f35 100644
--- a/update.php
+++ b/update.php
@@ -203,7 +203,8 @@ function update_selection_page() {
}
function update_script_selection_form() {
- $form = $all = array();
+ $form = array();
+ $count = 0;
$form['start'] = array(
'#tree' => TRUE,
'#type' => 'fieldset',
@@ -258,10 +259,10 @@ function update_script_selection_form() {
}
}
unset($default);
- $all += $pending;
+ $count = $count + count($pending);
}
- if (empty($all)) {
+ if (empty($count)) {
drupal_set_message(t('No pending updates.'));
unset($form);
$form['links'] = array(
@@ -273,7 +274,7 @@ function update_script_selection_form() {
'#markup' => '<p>The version of Drupal you are updating from has been automatically detected.</p>',
'#weight' => -5,
);
- $form['start']['#title'] = strtr('!num pending updates', array('!num' => count($all)));
+ $form['start']['#title'] = strtr('!num pending updates', array('!num' => $count));
$form['has_js'] = array(
'#type' => 'hidden',
'#default_value' => FALSE,