Changeset 343:f9fcb964c910 for inc/admin

Timestamp:

06/07/11 08:57:44 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

default

Parents:

342:a5d04d2da753 (diff), 341:796cb01c7120 (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:

Merged with 2.3 latest bugfixes

Files:

• inc/admin/lib.dc.page.php (modified) (3 diffs)
• inc/admin/lib.dc.page.php (modified) (1 diff)

inc/admin/lib.dc.page.php

@@ -16 +16 @@
 class dcPage
 {
+     private static $loaded_js=array();
+
      # Auth check
      public static function check($permissions)
@@ -349 +351 @@
      public static function jsLoad($src)
      {
-          return '<script type="text/javascript" src="'.html::escapeHTML($src).'"></script>'."\n";
+          $escaped_src = html::escapeHTML($src);
+          if (!isset(self::$loaded_js[$escaped_src])) {
+               self::$loaded_js[$escaped_src]=true;
+               return '<script type="text/javascript" src="'.$escaped_src.'"></script>'."\n";
+          }
      }
      
@@ -360 +366 @@
      {
           return
+          self::jsLoad('js/jquery/jquery.js').
           self::jsLoad('js/jquery/jquery.js').
           self::jsLoad('js/jquery/jquery.biscuit.js').

inc/admin/lib.dc.page.php

@@ -272 +272 @@
                } else {
                     $prof_url = http::getSelfURI();
-                    $prof_url .= (strpos($prof_url,'?') === false) ? '?' : '&';
+                    $prof_url .= (strpos($prof_url,'?') === false) ? '?' : '&';
                     $prof_url .= 'XDEBUG_PROFILE';
-                    $res .= '<p><a href="'.$prof_url.'">Trigger profiler</a></p>';
+                    $res .= '<p><a href="'.html::escapeURL($prof_url).'">Trigger profiler</a></p>';
                }