summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/user.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 7e0e24688..6d90de404 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1177,7 +1177,7 @@ function user_edit_form($uid, $edit) {
// Picture/avatar:
if (variable_get('user_pictures', 0)) {
$form['picture'] = array('#type' => 'fieldset', '#title' => t('Picture'), '#weight' => 1);
- if ($edit['picture'] && ($picture = theme('user_picture', array2object($edit)))) {
+ if ($edit['picture'] && ($picture = theme('user_picture', (object)$edit))) {
$form['picture']['current_picture'] = array('#type' => 'markup', '#value' => $picture);
$form['picture']['picture_delete'] = array('#type' => 'checkbox', '#title' => t('Delete picture'), '#description' => t('Check this box to delete your current picture.'));
}
@@ -1257,7 +1257,7 @@ function user_edit($category = 'account') {
global $user;
$account = user_load(array('uid' => arg(1)));
- $edit = $_POST['op'] ? $_POST['edit'] : object2array($account);
+ $edit = $_POST['op'] ? $_POST['edit'] : (array)$account;
if (arg(2) == 'delete') {
if ($edit['confirm']) {