merge r4013 from branch 2.0 to trunk

bug 1079: don't save settings in database when restore default settings.

git-svn-id: http://piwigo.org/svn/trunk@4014 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2009-10-10 12:36:09 +00:00
parent 44315512d1
commit 7e47a77f2e

View File

@@ -43,9 +43,6 @@ if (!defined('PHPWG_ROOT_PATH'))
// Reset to default (Guest) custom settings
if (isset($_POST['reset_to_default']))
{
// mass_updates function
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
$fields = array(
'nb_image_line', 'nb_line_page', 'maxwidth', 'maxheight', 'expand',
'show_nb_comments', 'show_nb_hits', 'recent_period', 'show_nb_hits'
@@ -60,12 +57,6 @@ SELECT '.implode(',', $fields).'
$result = pwg_query($query);
$default_user = mysql_fetch_assoc($result);
$userdata = array_merge($userdata, $default_user);
mass_updates(
USER_INFOS_TABLE,
array('primary' => array('user_id'), 'update' => $fields),
array($userdata)
);
}
save_profile_from_post($userdata, $errors);