Changeset 484:73d87eef9a70

Timestamp:

07/02/11 11:33:49 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

default

Parents:

482:81dcb3404411 (diff), 483:2304046cae42 (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

Files:

• inc/admin/prepend.php (modified) (1 diff)
• inc/admin/prepend.php (modified) (1 diff)

inc/admin/prepend.php

@@ -267 +267 @@
      }
 */
-     $_menu['Dashboard']->prependItem(__('My preferences'),'preferences.php','images/menu/user-pref.png',
-          preg_match('/preferences.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
-          true);
      $_menu['Dashboard']->prependItem(__('Dashboard'),'index.php','images/menu/dashboard.png',
           preg_match('/index.php$/',$_SERVER['REQUEST_URI']),

inc/admin/prepend.php

@@ -332 +332 @@
           foreach ($ws->dumpPrefs() as $k => $v) {
                $fav = unserialize($v['value']);
-               if (dc_valid_fav($fav[url])) {
+               if (dc_valid_fav($fav['url'])) {
                     $count++;
                     $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],