Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-26 06:45:07 +02:00
Code Issues Projects Releases Wiki Activity

Extend plugins_url to allow you to specify the plugin file you want to be relative to so slugs don't need to be hardcoded. Fixes #6341.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@10578 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2009-02-15 16:50:45 +00:00
parent f1098f3644
commit b9d1608150
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/link-template.php
View File

@ -1504,15 +1504,17 @@ function content_url($path = '') {
} }
/** /**
* Retrieve the url to the plugins directory. * Retrieve the url to the plugins directory or to a specific file within that directory.
* You can hardcode the plugin slug in $path or pass __FILE__ as a second argument to get the correct folder name.
* *
* @package WordPress * @package WordPress
* @since 2.6.0 * @since 2.6.0
* *
* @param string $path Optional. Path relative to the plugins url. * @param string $path Optional. Path relative to the plugins url.
* @param string $plugin Optional. The plugin file that you want to be relative to - i.e. pass in __FILE__
* @return string Plugins url link with optional path appended. * @return string Plugins url link with optional path appended.
*/ */
function plugins_url($path = '') { function plugins_url($path = '', $plugin = '') {
$scheme = ( is_ssl() ? 'https' : 'http' ); $scheme = ( is_ssl() ? 'https' : 'http' );
$url = WP_PLUGIN_URL; $url = WP_PLUGIN_URL;
if ( 0 === strpos($url, 'http') ) { if ( 0 === strpos($url, 'http') ) {
@ -1520,6 +1522,13 @@ function plugins_url($path = '') {
$url = str_replace( 'http://', "{$scheme}://", $url ); $url = str_replace( 'http://', "{$scheme}://", $url );
} }
if ( !empty($plugin) && is_string($plugin) )
{
$folder = dirname(plugin_basename($plugin));
if ('.' != $folder)
$url .= '/' . ltrim($folder, '/');
}
if ( !empty($path) && is_string($path) && strpos($path, '..') === false ) if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
$url .= '/' . ltrim($path, '/'); $url .= '/' . ltrim($path, '/');