summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-04 04:56:54 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-04 04:56:54 +0000
commit59b7e23b566013829bf628c2c188e02f776c965d (patch)
tree88c34c7b45a25cb158f563c03f0277bd5447f2dc /modules
parent5d001d94d64b1bd94e7b0064b72b06f68e0e2ed6 (diff)
downloadbrdo-59b7e23b566013829bf628c2c188e02f776c965d.tar.gz
brdo-59b7e23b566013829bf628c2c188e02f776c965d.tar.bz2
#367567 by sun, effulgentsia, yched, and quicksketch: Use AJAX framework for 'Add more' links.
Diffstat (limited to 'modules')
-rw-r--r--modules/color/color.module2
-rw-r--r--modules/openid/openid.module2
-rw-r--r--modules/openid/openid.pages.inc6
-rw-r--r--modules/simpletest/tests/form_test.module2
4 files changed, 6 insertions, 6 deletions
diff --git a/modules/color/color.module b/modules/color/color.module
index 7051386f2..882d23cba 100644
--- a/modules/color/color.module
+++ b/modules/color/color.module
@@ -31,7 +31,7 @@ function color_theme() {
* Implement hook_form_FORM_ID_alter().
*/
function color_form_system_theme_settings_alter(&$form, &$form_state) {
- if (isset($form_state['args'][0]) && ($theme = $form_state['args'][0]) && color_get_info($theme) && function_exists('gd_info')) {
+ if (isset($form_state['build_info']['args'][0]) && ($theme = $form_state['build_info']['args'][0]) && color_get_info($theme) && function_exists('gd_info')) {
$form['color'] = array(
'#type' => 'fieldset',
'#title' => t('Color scheme'),
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index f42c3db2a..5b44227d8 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -430,7 +430,7 @@ function openid_authentication($response) {
}
elseif (variable_get('user_register', 1)) {
// Register new user
- $form_state['args'] = array();
+ $form_state['build_info']['args'] = array();
$form_state['redirect'] = NULL;
$form_state['values']['name'] = (empty($response['openid.sreg.nickname'])) ? $identity : $response['openid.sreg.nickname'];
$form_state['values']['mail'] = (empty($response['openid.sreg.email'])) ? '' : $response['openid.sreg.email'];
diff --git a/modules/openid/openid.pages.inc b/modules/openid/openid.pages.inc
index 5fef3bf37..11f82c986 100644
--- a/modules/openid/openid.pages.inc
+++ b/modules/openid/openid.pages.inc
@@ -104,12 +104,12 @@ function openid_user_delete_form($form, $form_state, $account, $aid = 0) {
function openid_user_delete_form_submit($form, &$form_state) {
$query = db_delete('authmap')
- ->condition('uid', $form_state['args'][0]->uid)
- ->condition('aid', $form_state['args'][1])
+ ->condition('uid', $form_state['build_info']['args'][0]->uid)
+ ->condition('aid', $form_state['build_info']['args'][1])
->condition('module', 'openid')
->execute();
if ($query) {
drupal_set_message(t('OpenID deleted.'));
}
- $form_state['redirect'] = 'user/' . $form_state['args'][0]->uid . '/openid';
+ $form_state['redirect'] = 'user/' . $form_state['build_info']['args'][0]->uid . '/openid';
}
diff --git a/modules/simpletest/tests/form_test.module b/modules/simpletest/tests/form_test.module
index a502e8e8a..af4dbccde 100644
--- a/modules/simpletest/tests/form_test.module
+++ b/modules/simpletest/tests/form_test.module
@@ -347,7 +347,7 @@ function form_storage_test_form_submit($form, &$form_state) {
*/
function form_test_wrapper_callback($form_id) {
$form_state = array(
- 'args' => array(),
+ 'build_info' => array('args' => array()),
'wrapper_callback' => 'form_test_wrapper_callback_wrapper',
);
return drupal_build_form($form_id, $form_state);