diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-11-13 18:56:18 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-11-13 18:56:18 +0000 |
| commit | 79dbaee37760b8cb3e835affdfea83465414c122 (patch) | |
| tree | 1256ba32b8071399a698b33528ce19142f62b70a | |
| parent | d510632e9f07cec9ac3de3b5dafc56bd58c81b8a (diff) | |
| download | wordpress-mu-79dbaee37760b8cb3e835affdfea83465414c122.tar.gz wordpress-mu-79dbaee37760b8cb3e835affdfea83465414c122.tar.xz wordpress-mu-79dbaee37760b8cb3e835affdfea83465414c122.zip | |
Use PLUGINDIR (fixes #191)
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@805 7be80a69-a1ef-0310-a953-fb0f7c49ff36
| -rw-r--r-- | wp-admin/plugins.php | 2 | ||||
| -rw-r--r-- | wp-settings.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 48c7b60..2acf689 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -110,7 +110,7 @@ if (empty($plugins)) { $plugin_data['Description'] = wp_kses($plugin_data['Description'], array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array()) ); ; if ( $style != '' ) $style = 'class="' . $style . '"'; - if ( is_writable(ABSPATH . 'wp-content/plugins/' . $plugin_file) ) + if ( is_writable(ABSPATH . PLUGINDIR . '/' . $plugin_file) ) $edit = "<a href='plugin-editor.php?file=$plugin_file' title='".__('Open this file in the Plugin Editor')."' class='edit'>".__('Edit')."</a>"; else $edit = ''; diff --git a/wp-settings.php b/wp-settings.php index d82c124..088d8fa 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -258,8 +258,8 @@ if ( get_option('active_plugins') ) { $current_plugins = get_option('active_plugins'); if ( is_array($current_plugins) ) { foreach ($current_plugins as $plugin) { - if ('' != $plugin && file_exists(ABSPATH . 'wp-content/plugins/' . $plugin)) - include_once(ABSPATH . 'wp-content/plugins/' . $plugin); + if ('' != $plugin && file_exists(ABSPATH . PLUGINDIR . '/' . $plugin)) + include_once(ABSPATH . PLUGINDIR . '/' . $plugin); } } } |