Navigation

← Previous Changeset
Next Changeset →

Changeset 1412

Timestamp:

08/04/08 17:10:27 (4 months ago)

Author:

donncha

Message:

Change ABSPATH . MUPLUGINDIR to WPMU_PLUGIN_DIR

Files:

trunk/wp-admin/admin.php (modified) (2 diffs)
trunk/wp-admin/menu-header.php (modified) (9 diffs)
trunk/wp-includes/plugin.php (modified) (1 diff)
trunk/wp-includes/wpmu-functions.php (modified) (1 diff)
trunk/wp-settings.php (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/wp-admin/admin.php

r1374	r1412
60	60	}
61	61
62		if (! file_exists(ABSPATH . PLUGINDIR . "/$plugin_page") && ! file_exists(~~ABSPATH . MUPLUGIN~~DIR . "/$plugin_page"))
	62	if (! file_exists(ABSPATH . PLUGINDIR . "/$plugin_page") && ! file_exists(WPMU_PLUGIN_DIR . "/$plugin_page"))
63	63	wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
64	64
…	…
68	68	require_once(ABSPATH . 'wp-admin/admin-header.php');
69	69
70		if ( file_exists(~~ABSPATH . MUPLUGIN~~DIR . "/$plugin_page") )
71		include(~~ABSPATH . MUPLUGIN~~DIR . "/$plugin_page");
	70	if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
	71	include(WPMU_PLUGIN_DIR . "/$plugin_page");
72	72	else
73	73	include(ABSPATH . PLUGINDIR . "/$plugin_page");

trunk/wp-admin/menu-header.php

r1328	r1412
23	23	$submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
24	24	$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
25		if ( file_exists(ABSPATH . PLUGINDIR . "/{$submenu[$item[2]][0][2]}") \|\| file_exists(~~ABSPATH . MUPLUGIN~~DIR . "/{$submenu[$item[2]][0][2]}") \|\| !empty($menu_hook))
	25	if ( file_exists(ABSPATH . PLUGINDIR . "/{$submenu[$item[2]][0][2]}") \|\| file_exists(WPMU_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") \|\| !empty($menu_hook))
26	26	echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
27	27	else
…	…
29	29	} else if ( current_user_can($item[1]) ) {
30	30	$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
31		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") \|\| file_exists(~~ABSPATH . MUPLUGIN~~DIR . "/{$item[2]}") \|\| !empty($menu_hook))
	31	if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") \|\| file_exists(WPMU_PLUGIN_DIR . "/{$item[2]}") \|\| !empty($menu_hook))
32	32	echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
33	33	else
…	…
53	53	$submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
54	54	$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
55		if ( file_exists(ABSPATH . PLUGINDIR . "/{$submenu[$item[2]][0][2]}") \|\| file_exists(~~ABSPATH . MUPLUGIN~~DIR . "/{$submenu[$item[2]][0][2]}") \|\| !empty($menu_hook))
	55	if ( file_exists(ABSPATH . PLUGINDIR . "/{$submenu[$item[2]][0][2]}") \|\| file_exists(WPMU_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") \|\| !empty($menu_hook))
56	56	echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
57	57	else
…	…
59	59	} else if ( current_user_can($item[1]) ) {
60	60	$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
61		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") \|\| file_exists(~~ABSPATH . MUPLUGIN~~DIR . "/{$item[2]}") \|\| !empty($menu_hook))
	61	if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") \|\| file_exists(WPMU_PLUGIN_DIR . "/{$item[2]}") \|\| !empty($menu_hook))
62	62	echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
63	63	else
…	…
78	78	$submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
79	79	$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
80		if ( file_exists(ABSPATH . PLUGINDIR . "/{$submenu[$item[2]][0][2]}") \|\| file_exists(~~ABSPATH . MUPLUGIN~~DIR . "/{$submenu[$item[2]][0][2]}") \|\| !empty($menu_hook))
	80	if ( file_exists(ABSPATH . PLUGINDIR . "/{$submenu[$item[2]][0][2]}") \|\| file_exists(WPMU_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") \|\| !empty($menu_hook))
81	81	echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
82	82	else
…	…
84	84	} else if ( current_user_can($item[1]) ) {
85	85	$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
86		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") \|\| file_exists(~~ABSPATH . MUPLUGIN~~DIR . "/{$item[2]}") )
	86	if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") \|\| file_exists(WPMU_PLUGIN_DIR . "/{$item[2]}") )
87	87	echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
88	88	else
…	…
110	110	$submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
111	111	$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
112		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") \|\| file_exists(~~ABSPATH . MUPLUGIN~~DIR . "/{$item[2]}") )
	112	if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") \|\| file_exists(WPMU_PLUGIN_DIR . "/{$item[2]}") )
113	113	$side_items[] = "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
114	114	else
…	…
116	116	} else if ( current_user_can($item[1]) ) {
117	117	$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
118		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") \|\| file_exists(~~ABSPATH . MUPLUGIN~~DIR . "/{$item[2]}") )
	118	if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") \|\| file_exists(WPMU_PLUGIN_DIR . "/{$item[2]}") )
119	119	$side_items[] = "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a>";
120	120	else
…	…
147	147	$menu_hook = get_plugin_page_hook($item[2], $parent_file);
148	148
149		if (file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") \|\| file_exists(~~ABSPATH . MUPLUGIN~~DIR . "/{$item[2]}") \|\| ! empty($menu_hook)) {
	149	if (file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") \|\| file_exists(WPMU_PLUGIN_DIR . "/{$item[2]}") \|\| ! empty($menu_hook)) {
150	150	if ( 'admin.php' == $pagenow )
151	151	echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";

trunk/wp-includes/plugin.php

r1328	r1412
453	453	$plugin_dir = preg_replace('\|/+\|','/', $plugin_dir); // remove any duplicate slash
454	454	$file = preg_replace('\|^' . preg_quote($plugin_dir, '\|') . '/\|','',$file); // get relative path from plugins dir
455		$file = preg_replace('\|^.*/' . MUPLUGINDIR . '/\|','',$file); // get relative path from plugins dir
	455
	456	$mu_plugin_dir = str_replace('\\','/',WPMU_PLUGIN_DIR); // sanitize for Win32 installs
	457	$mu_plugin_dir = preg_replace('\|/+\|','/', $mu_plugin_dir); // remove any duplicate slash
	458	$file = preg_replace('\|^' . preg_quote($mu_plugin_dir, '\|') . '/\|','',$file); // get relative path from mu_plugins dir
456	459	return $file;
457	460	}

trunk/wp-includes/wpmu-functions.php

r1405	r1412
9	9
10	10	if ( false === $path )
11		$path = ~~MUPLUGIN~~DIR;
12
13		$mofile = ~~ABSPATH . "$path~~/$domain-$locale.mo";
	11	$path = WPMU_PLUGIN_DIR;
	12
	13	$mofile = WPMU_PLUGIN_DIR . "/$domain-$locale.mo";
14	14	load_textdomain($domain, $mofile);
15	15	}

trunk/wp-settings.php

r1410	r1412
326	326	define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat.
327	327
328		if( is_dir( ~~ABSPATH . MUPLUGIN~~DIR ) ) {
329		if( $dh = opendir( ~~ABSPATH . MUPLUGIN~~DIR ) ) {
	328	if( is_dir( WPMU_PLUGIN_DIR ) ) {
	329	if( $dh = opendir( WPMU_PLUGIN_DIR ) ) {
330	330	while( ( $plugin = readdir( $dh ) ) !== false ) {
331	331	if( substr( $plugin, -4 ) == '.php' ) {
332		include_once( ~~ABSPATH . MUPLUGIN~~DIR . '/' . $plugin );
	332	include_once( WPMU_PLUGIN_DIR . '/' . $plugin );
333	333	}
334	334	}

Navigation

Changeset 1412

Legend:

trunk/wp-admin/admin.php

trunk/wp-admin/menu-header.php

trunk/wp-includes/plugin.php

trunk/wp-includes/wpmu-functions.php

trunk/wp-settings.php

Download in other formats: