Changeset 21664 for trunk/wp-admin/includes/plugin.php

Timestamp:

08/30/2012 01:33:00 PM (12 years ago)

Author:

ryan

Message:

Use set_url_scheme(). Props johnbillion, MarcusPope. see #19037 #20759

File:

• trunk/wp-admin/includes/plugin.php (modified) (1 diff)

trunk/wp-admin/includes/plugin.php

@@ -904 +904 @@
     if ( empty($icon_url) )
         $icon_url = esc_url( admin_url( 'images/generic.png' ) );
-    elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
-        $icon_url = 'https://' . substr($icon_url, 7);
+    else
+        $icon_url = set_url_scheme( $icon_url );
 
     $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );