Changeset 1107:3943962d69b8 for admin/preferences.php

Timestamp:

02/27/13 11:48:32 (13 years ago)

Author:

JcDenis

Branch:

sexy

Parents:

880:02c78f56f430 (diff), 1105:ce855d61f9ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with default branch in 2.5-RC

Files:

• admin/preferences.php (modified) (4 diffs)
• admin/preferences.php (modified) (1 diff)

admin/preferences.php

@@ -162 +162 @@
           $cur->user_options = new ArrayObject($user_options);
           
-          # --BEHAVIOR-- adminBeforeUserUpdate
-          $core->callBehavior('adminBeforeUserUpdate',$cur,$core->auth->userID());
+          # --BEHAVIOR-- adminBeforeUserOptionsUpdate
+          $core->callBehavior('adminBeforeUserOptionsUpdate',$cur,$core->auth->userID());
           
           # Update user prefs
@@ -181 +181 @@
           $core->updUser($core->auth->userID(),$cur);
           
-          # --BEHAVIOR-- adminAfterUserUpdate
-          $core->callBehavior('adminAfterUserUpdate',$cur,$core->auth->userID());
+          # --BEHAVIOR-- adminAfterUserOptionsUpdate
+          $core->callBehavior('adminAfterUserOptionsUpdate',$cur,$core->auth->userID());
           
           http::redirect('preferences.php?updated=1');
@@ -343 +343 @@
      dcPage::jsLoad('js/_preferences.js').
      ($user_acc_nodragdrop ? '' : dcPage::jsLoad('js/_preferences-dragdrop.js')).
-     dcPage::jsLoad('js/jquery/jquery-ui-1.8.12.custom.min.js').
+     dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
      dcPage::jsPageTabs($default_tab).
      dcPage::jsConfirmClose('user-form').
@@ -352 +352 @@
 
 if (!empty($_GET['upd'])) {
-          echo '<p class="message">'.__('Personal information has been successfully updated.').'</p>';
+     dcPage::message(__('Personal information has been successfully updated.'));
 }
 if (!empty($_GET['updated'])) {
-          echo '<p class="message">'.__('Personal options has been successfully updated.').'</p>';
+     dcPage::message(__('Personal options has been successfully updated.'));
 }
 if (!empty($_GET['append'])) {
-          echo '<p class="message">'.__('Favorites have been successfully added.').'</p>';
+     dcPage::message(__('Favorites have been successfully added.'));
 }
 if (!empty($_GET['neworder'])) {
-     echo '<p class="message">'.__('Favorites have been successfully updated.').'</p>';
+     dcPage::message(__('Favorites have been successfully updated.'));
 }
 if (!empty($_GET['removed'])) {
-          echo '<p class="message">'.__('Favorites have been successfully removed.').'</p>';
+     dcPage::message(__('Favorites have been successfully removed.'));
 }
 if (!empty($_GET['replaced'])) {
-          echo '<p class="message">'.__('Default favorites have been successfully updated.').'</p>';
+     dcPage::message(__('Default favorites have been successfully updated.'));
 }
 

admin/preferences.php

@@ -456 +456 @@
 __('Enable WYSIWYG mode').'</label></p>'.
 
-'<p><label for="user_ui_enhanceduploader" class="classic">'.
-form::checkbox('user_ui_enhanceduploader',1,$user_ui_enhanceduploader).' '.
-__('Activate enhanced uploader in media manager').'</label></p>'.
-
 '<p><label for="user_ui_nofavmenu" class="classic">'.
 form::checkbox('user_ui_nofavmenu',1,$user_ui_nofavmenu).' '.