From 7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 4 Apr 2008 16:44:15 +0000 Subject: Merged with WordPress 2.5, unstable, only for testing git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/plugin-editor.php | 123 +++++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 61 deletions(-) (limited to 'wp-admin/plugin-editor.php') diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php index e9fc912..f84daa1 100644 --- a/wp-admin/plugin-editor.php +++ b/wp-admin/plugin-editor.php @@ -7,12 +7,16 @@ $parent_file = 'plugins.php'; wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file')); +add_action( 'admin_head', 'theme_editor_css' ); +function theme_editor_css(){ + wp_admin_css( 'css/theme-editor' ); +} + $plugins = get_plugins(); $plugin_files = array_keys($plugins); -if (empty($file)) { +if (empty($file)) $file = $plugin_files[0]; -} $file = validate_file_to_edit($file, $plugin_files); $real_file = get_real_file_to_edit( PLUGINDIR . "/$file"); @@ -27,27 +31,23 @@ case 'update': wp_die('

'.__('You do not have sufficient permissions to edit templates for this blog.').'

'); $newcontent = stripslashes($_POST['newcontent']); - if (is_writeable($real_file)) { + if ( is_writeable($real_file) ) { $f = fopen($real_file, 'w+'); fwrite($f, $newcontent); fclose($f); // Deactivate so we can test it. - $current = get_option('active_plugins'); - if ( in_array($file, $current) || isset($_POST['phperror']) ) { - if ( in_array($file, $current) ) { - array_splice($current, array_search( $file, $current), 1 ); // Array-fu! - update_option('active_plugins', $current); - } + if ( is_plugin_active($file) || isset($_POST['phperror']) ) { + if ( is_plugin_active($file) ) + deactivate_plugins($file, true); wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1")); - exit(); + exit; } wp_redirect("plugin-editor.php?file=$file&a=te"); } else { wp_redirect("plugin-editor.php?file=$file"); } - - exit(); + exit; break; @@ -56,73 +56,75 @@ default: if ( !current_user_can('edit_plugins') ) wp_die('

'.__('You do not have sufficient permissions to edit plugins for this blog.').'

'); - if ( $_GET['liveupdate'] ) { + if ( isset($_GET['liveupdate']) ) { check_admin_referer('edit-plugin-test_' . $file); - $current = get_option('active_plugins'); - $plugin = $file; - if ( validate_file($plugin) ) - wp_die(__('Invalid plugin.')); - if ( ! file_exists(ABSPATH . PLUGINDIR . '/' . $plugin) ) - wp_die(__('Plugin file does not exist.')); - if (!in_array($plugin, $current)) { - wp_redirect("plugin-editor.php?file=$file&phperror=1"); // we'll override this later if the plugin can be included without fatal error - @include(ABSPATH . PLUGINDIR . '/' . $plugin); - $current[] = $plugin; - sort($current); - update_option('active_plugins', $current); - } + + $error = validate_plugin($file); + if( is_wp_error($error) ) + wp_die( $error ); + + if ( ! is_plugin_active($file) ) + activate_plugin($file, "plugin-editor.php?file=$file&phperror=1");// we'll override this later if the plugin can be included without fatal error + wp_redirect("plugin-editor.php?file=$file&a=te"); + exit; } require_once('admin-header.php'); update_recently_edited(PLUGINDIR . "/$file"); - if (!is_file($real_file)) + if ( ! is_file($real_file) ) $error = 1; - if (!$error) { - $f = fopen($real_file, 'r'); - $content = fread($f, filesize($real_file)); - $content = htmlspecialchars($content); - } + if ( ! $error ) + $content = htmlspecialchars(file_get_contents($real_file)); ?>

-

fatal error.') ?>

+

fatal error.') ?>

+ + + +
- ' . sprintf(__('Editing %s (active)'), $file) . ''; - } else { - echo '

' . sprintf(__('Browsing %s (active)'), $file) . '

'; - } +
+

+
+
+
+%s (active)'), $file); + else + echo sprintf(__('Browsing %s (active)'), $file); } else { - if (is_writeable($real_file)) { - echo '

' . sprintf(__('Editing %s (inactive)'), $file) . '

'; - } else { - echo '

' . sprintf(__('Browsing %s (inactive)'), $file) . '

'; - } + if ( is_writeable($real_file) ) + echo sprintf(__('Editing %s (inactive)'), $file); + else + echo sprintf(__('Browsing %s (inactive)'), $file); } - ?> + ?> +
+
+
+
-

+

- +

    - -
  • ">
    • - + +
    • +
- -
- +
+
@@ -136,13 +138,13 @@ if ($plugin_files) :

"; + echo ""; else - echo ""; + echo ""; ?>

-

+

the Codex for more information.'); ?>

 
-- cgit