#71772 by Bart Jansens, fix various php warnings

11 files changed, 12 insertions, 12 deletions

diff --git a/includes/form.inc b/includes/form.inc
index 82a606664..3088e6339 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -226,13 +226,13 @@ function _form_validate($elements, $form_id = NULL) {
           foreach ($value as $v) {
             if (!isset($options[$v])) {
               form_error($elements, t('An illegal choice has been detected. Please contact the site administrator.'));
-              watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme('placeholder', check_plain($v)), '%name' => theme_placeholder(empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title'])), WATCHDOG_ERROR));
+              watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme('placeholder', check_plain($v)), '%name' => theme_placeholder(empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']))), WATCHDOG_ERROR);
             }
           }
         }
         elseif (!isset($options[$elements['#value']])) {
           form_error($elements, t('An illegal choice has been detected. Please contact the site administrator.'));
-          watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme_placeholder(check_plain($v)), '%name' => theme('placeholder', empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title'])), WATCHDOG_ERROR));
+          watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme_placeholder(check_plain($v)), '%name' => theme('placeholder', empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']))), WATCHDOG_ERROR);
         }
       }
     }
diff --git a/modules/block.module b/modules/block.module
index 588bb2918..8df23b206 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -223,7 +223,7 @@ function block_admin_display() {
     $form[$i]['theme'] = array('#type' => 'hidden', '#value' => $theme_key);
     $form[$i]['weight'] = array('#type' => 'weight', '#default_value' => $block['weight']);
     $form[$i]['region'] = array('#type' => 'select',
-      '#default_value' => isset($block['region']) ? $block['region'] : system_default_region(),
+      '#default_value' => isset($block['region']) ? $block['region'] : system_default_region($theme_key),
       '#options' => $block_regions,
     );
 
diff --git a/modules/block/block.module b/modules/block/block.module
index 588bb2918..8df23b206 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -223,7 +223,7 @@ function block_admin_display() {
     $form[$i]['theme'] = array('#type' => 'hidden', '#value' => $theme_key);
     $form[$i]['weight'] = array('#type' => 'weight', '#default_value' => $block['weight']);
     $form[$i]['region'] = array('#type' => 'select',
-      '#default_value' => isset($block['region']) ? $block['region'] : system_default_region(),
+      '#default_value' => isset($block['region']) ? $block['region'] : system_default_region($theme_key),
       '#options' => $block_regions,
     );
 
diff --git a/modules/filter.module b/modules/filter.module
index f8fe5774b..e3c65344c 100644
--- a/modules/filter.module
+++ b/modules/filter.module
@@ -844,7 +844,7 @@ function filter_form_validate($form) {
     }
   }
   form_error($form, t('An illegal choice has been detected. Please contact the site administrator.'));
-  watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme('placeholder', check_plain($v)), '%name' => theme('placeholder', empty($form['#title']) ? $form['#parents'][0] : $form['#title'])), WATCHDOG_ERROR));
+  watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme('placeholder', check_plain($v)), '%name' => theme('placeholder', empty($form['#title']) ? $form['#parents'][0] : $form['#title']))), WATCHDOG_ERROR);
 }
 
 /**
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index f8fe5774b..e3c65344c 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -844,7 +844,7 @@ function filter_form_validate($form) {
     }
   }
   form_error($form, t('An illegal choice has been detected. Please contact the site administrator.'));
-  watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme('placeholder', check_plain($v)), '%name' => theme('placeholder', empty($form['#title']) ? $form['#parents'][0] : $form['#title'])), WATCHDOG_ERROR));
+  watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme('placeholder', check_plain($v)), '%name' => theme('placeholder', empty($form['#title']) ? $form['#parents'][0] : $form['#title']))), WATCHDOG_ERROR);
 }
 
 /**
diff --git a/modules/legacy.module b/modules/legacy.module
index d6a34dfcb..add982cfb 100644
--- a/modules/legacy.module
+++ b/modules/legacy.module
@@ -125,7 +125,7 @@ function legacy_filter($op, $delta = 0, $format = -1, $text = '') {
       return t('Replaces URLs from Drupal 4.1 (and lower) with updated equivalents.');
 
     case 'process':
-      return _legacy_filter_old_urls($text, $format);
+      return _legacy_filter_old_urls($text);
 
     case 'settings':
       return;
diff --git a/modules/legacy/legacy.module b/modules/legacy/legacy.module
index d6a34dfcb..add982cfb 100644
--- a/modules/legacy/legacy.module
+++ b/modules/legacy/legacy.module
@@ -125,7 +125,7 @@ function legacy_filter($op, $delta = 0, $format = -1, $text = '') {
       return t('Replaces URLs from Drupal 4.1 (and lower) with updated equivalents.');
 
     case 'process':
-      return _legacy_filter_old_urls($text, $format);
+      return _legacy_filter_old_urls($text);
 
     case 'settings':
       return;
diff --git a/modules/ping.module b/modules/ping.module
index c84b6a325..cf35a8e12 100644
--- a/modules/ping.module
+++ b/modules/ping.module
@@ -37,7 +37,7 @@ function ping_cron() {
   global $base_url;
 
   if (variable_get('site_name', 0) && variable_get('site_slogan', 0)) {
-    if (db_num_rows(db_query("SELECT nid FROM {node} WHERE status = 1 AND moderate = 0 AND (created > '". variable_get('cron_last', time()) ."' OR changed > '". variable_get('cron_last', time()) ."')"), 1)) {
+    if (db_num_rows(db_query("SELECT nid FROM {node} WHERE status = 1 AND moderate = 0 AND (created > '". variable_get('cron_last', time()) ."' OR changed > '". variable_get('cron_last', time()) ."')"))) {
       _ping_notify(variable_get('site_name', '') .' - '. variable_get('site_slogan', ''), $base_url);
     }
   }
diff --git a/modules/ping/ping.module b/modules/ping/ping.module
index c84b6a325..cf35a8e12 100644
--- a/modules/ping/ping.module
+++ b/modules/ping/ping.module
@@ -37,7 +37,7 @@ function ping_cron() {
   global $base_url;
 
   if (variable_get('site_name', 0) && variable_get('site_slogan', 0)) {
-    if (db_num_rows(db_query("SELECT nid FROM {node} WHERE status = 1 AND moderate = 0 AND (created > '". variable_get('cron_last', time()) ."' OR changed > '". variable_get('cron_last', time()) ."')"), 1)) {
+    if (db_num_rows(db_query("SELECT nid FROM {node} WHERE status = 1 AND moderate = 0 AND (created > '". variable_get('cron_last', time()) ."' OR changed > '". variable_get('cron_last', time()) ."')"))) {
       _ping_notify(variable_get('site_name', '') .' - '. variable_get('site_slogan', ''), $base_url);
     }
   }
diff --git a/modules/profile.module b/modules/profile.module
index b269c2688..067da9f3f 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -361,7 +361,7 @@ function profile_field_delete($fid) {
   $form['fid'] = array('#type' => 'value', '#value' => $fid);
   $form['title'] = array('#type' => 'value', '#value' => $field->title);
 
-  return confirm_form('profile_field_delete', $form, t('Are you sure you want to delete the field %field?', array('%field' => theme('placeholder', $field->title))), 'admin/settings/profile', t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to <a href="%edit-field">edit this field</a> and change it to a %hidden-field so that it may only be accessed by administrators.', array('%edit-field' => url('admin/settings/profile/edit/' . $fid), '%hidden-field' => theme('placeholder', t('hidden profile field'))), t('Delete'), t('Cancel')));
+  return confirm_form('profile_field_delete', $form, t('Are you sure you want to delete the field %field?', array('%field' => theme('placeholder', $field->title))), 'admin/settings/profile', t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to <a href="%edit-field">edit this field</a> and change it to a %hidden-field so that it may only be accessed by administrators.', array('%edit-field' => url('admin/settings/profile/edit/' . $fid), '%hidden-field' => theme('placeholder', t('hidden profile field')))), t('Delete'), t('Cancel'));
 }
 
 /**
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index b269c2688..067da9f3f 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -361,7 +361,7 @@ function profile_field_delete($fid) {
   $form['fid'] = array('#type' => 'value', '#value' => $fid);
   $form['title'] = array('#type' => 'value', '#value' => $field->title);
 
-  return confirm_form('profile_field_delete', $form, t('Are you sure you want to delete the field %field?', array('%field' => theme('placeholder', $field->title))), 'admin/settings/profile', t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to <a href="%edit-field">edit this field</a> and change it to a %hidden-field so that it may only be accessed by administrators.', array('%edit-field' => url('admin/settings/profile/edit/' . $fid), '%hidden-field' => theme('placeholder', t('hidden profile field'))), t('Delete'), t('Cancel')));
+  return confirm_form('profile_field_delete', $form, t('Are you sure you want to delete the field %field?', array('%field' => theme('placeholder', $field->title))), 'admin/settings/profile', t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to <a href="%edit-field">edit this field</a> and change it to a %hidden-field so that it may only be accessed by administrators.', array('%edit-field' => url('admin/settings/profile/edit/' . $fid), '%hidden-field' => theme('placeholder', t('hidden profile field')))), t('Delete'), t('Cancel'));
 }
 
 /**