vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert [14347] and [14372]. It broke more than we expected. Try again in 3.1. see #13051

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@14374 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2010-05-03 18:16:22 +00:00
parent 80043f2232
commit 57a5a11660
36 changed files with 146 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -822,7 +822,7 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func
add_action( $hookname, $function );
if ( empty($icon_url) )
$icon_url = admin_url( 'images/generic.png' );
$icon_url = esc_url( admin_url( 'images/generic.png' ) );
elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
$icon_url = 'https://' . substr($icon_url, 7);