WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure plugin menu icons are delivered via https if is_ssl(). Props DD32. fixes #8901 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11186 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-05-05 02:38:18 +00:00
parent e30370d886
commit 7186506de4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/plugin.php
View File

@ -594,6 +594,8 @@ function add_menu_page( $page_title, $menu_title, $access_level, $file, $functio
if ( empty($icon_url) ) if ( empty($icon_url) )
$icon_url = 'images/generic.png'; $icon_url = 'images/generic.png';
elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
$icon_url = 'https://' . substr($icon_url, 7);
$menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url ); $menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
@ -634,6 +636,8 @@ function add_utility_page( $page_title, $menu_title, $access_level, $file, $func
if ( empty($icon_url) ) if ( empty($icon_url) )
$icon_url = 'images/generic.png'; $icon_url = 'images/generic.png';
elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
$icon_url = 'https://' . substr($icon_url, 7);
$_wp_last_utility_menu++; $_wp_last_utility_menu++;