Changes in admin/preferences.php [32:e8933345dadf:35:295656ef2920]

File:

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

admin/preferences.php

@@ -205 +205 @@
      try {
           $user_favs = $ws->DumpLocalPrefs();
-          foreach ($user_favs as $k => $v)
-          {
-               $core->auth->user_prefs->favorites->drop($k);
-          }
+          $core->auth->user_prefs->favorites->dropAll();
           $count = 0;
           foreach ($user_favs as $k => $v)
@@ -243 +240 @@
           $ws = $core->auth->user_prefs->addWorkspace('favorites');
           $user_favs = $ws->DumpLocalPrefs();
-          foreach ($user_favs as $k => $v)
-          {
-               $core->auth->user_prefs->favorites->drop($k);
-          }
+          $core->auth->user_prefs->favorites->dropAll();
           $count = 0;
           foreach ($order as $i => $k) {
@@ -270 +264 @@
           $ws = $core->auth->user_prefs->addWorkspace('favorites');
           $user_favs = $ws->DumpLocalPrefs();
-          $def_favs = $ws->DumpGlobalPrefs();
-          foreach ($def_favs as $k => $v)
-          {
-               $core->auth->user_prefs->favorites->drop($k,true);
-          }
+          $core->auth->user_prefs->favorites->dropAll(true);
           $count = 0;
           foreach ($user_favs as $k => $v)
@@ -462 +452 @@
                echo '<li id="fu-'.$k.'">'.
                     '<img src="'.$fav['large-icon'].'" alt="" /> '.
-                    form::field(array('order['.$k.']'),2,3,$count,'position','',false,'title="position de '.$fav['title'].'"').
+                    form::field(array('order['.$k.']'),2,3,$count,'position','',false,'title="'.sprintf(__('position of %s'),$fav['title']).'"').
                     form::hidden('dynorder[]',$k).
                     '<label for="fuk-'.$k.'">'.form::checkbox(array('remove[]','fuk-'.$k),$k).$fav['title'].'</label>'.