Changeset 172:c78042afdbb1 for inc

Timestamp:

05/05/11 22:02:50 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

default

Message:

Deuxième pas vers un bugfix de la détection de favori actif

File:

• inc/admin/prepend.php (modified) (3 diffs)

inc/admin/prepend.php

@@ -21 +21 @@
 
 define('DC_CONTEXT_ADMIN',true);
+
+function dc_prepare_url($url) {
+
+     $u = str_replace(array('?','&'),array('\?','&'),$url);
+     return (!strpos($u,'&') ? 
+          '/'.$u.'(\?.*)?$/' :
+          '/'.$u.'(&.*)?$/');
+}
 
 function dc_load_locales() {
@@ -302 +310 @@
                $fav = unserialize($v['value']);
                $_menu['Favorites']->addItem($fav['title'],$fav['url'],$fav['small-icon'],
-                    preg_match('/'.str_replace(array('?','&'),array('\?','\&'),$fav['url']).'([\?\&].*)?$/',$_SERVER['REQUEST_URI']),
+                    preg_match(dc_prepare_url($fav['url']),$_SERVER['REQUEST_URI']),
                     (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
           }
@@ -312 +320 @@
                $fav = unserialize($v['value']);
                $_menu['Favorites']->addItem($fav['title'],$fav['url'],$fav['small-icon'],
-                    preg_match('/'.str_replace(array('?','&'),array('\?','\&'),$fav['url']).'([\?\&].*)?$/',$_SERVER['REQUEST_URI']),
+                    preg_match(dc_prepare_url($fav['url']),$_SERVER['REQUEST_URI']),
                     (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
           }