Ticket #2866: wp-widgets-phantom-fix.diff

widgets.php

@@ -194 +194 @@
         global $registered_widgets, $registered_sidebars, $registered_widget_controls;
 
         if ( file_exists(dirname(__FILE__).'/scriptaculous/scriptaculous.js') )
-                $scriptdir = str_replace(ABSPATH, get_settings('siteurl').'/', dirname(__FILE__)) . '/scriptaculous';
+                $scriptdir = get_settings('siteurl').'/wp-content/plugins/' . dirname(plugin_basename(__FILE__)) . '/scriptaculous';
         else
                 $scriptdir = get_settings('siteurl') . '/wp-includes/js/scriptaculous';
 
@@ -939 +939 @@
                 $title = "Unknown Feed";
         $url = wp_specialchars(strip_tags($url), 1);
         if ( file_exists(dirname(__FILE__) . '/rss.png') )
-                $icon = str_replace(ABSPATH, get_settings('siteurl').'/', dirname(__FILE__)) . '/rss.png';
+                $icon = get_settings('siteurl').'/wp-content/plugins/' . dirname(plugin_basename(__FILE__)) . '/rss.png';
         else
                 $icon = get_settings('siteurl').'/wp-includes/images/rss.png';
         $title = "<a class='rsswidget' href='$url' title='Syndicate this content'><img width='14' height='14' src='$icon' alt='RSS' /></a> <a class='rsswidget' href='$link' title='$desc'>$title</a>";