Wordpress 4.6

[autoinstalls/wordpress.git] / wp-admin / plugin-editor.php

diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index 6ffadf69c16b5da627bce8b2d62c53a67ce61538..754c4265b261098a3dce404b25806b8199ab64dc 100644 (file)
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -15,7 +15,7 @@ if ( is_multisite() && ! is_network_admin() ) {
 }
 
 if ( !current_user_can('edit_plugins') )
-       wp_die( __('You do not have sufficient permissions to edit plugins for this site.') );
+       wp_die( __('Sorry, you are not allowed to edit plugins for this site.') );
 
 $title = __("Edit Plugins");
 $parent_file = 'plugins.php';
@@ -71,8 +71,11 @@ case 'update':
                        if ( is_plugin_active($file) )
                                deactivate_plugins($file, true);
 
-                       if ( ! is_network_admin() )
+                       if ( ! is_network_admin() ) {
                                update_option( 'recently_activated', array( $file => time() ) + (array) get_option( 'recently_activated' ) );
+                       } else {
+                               update_site_option( 'recently_activated', array( $file => time() ) + (array) get_site_option( 'recently_activated' ) );
+                       }
 
                        wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));
                        exit;
@@ -103,7 +106,7 @@ default:
        $editable_extensions = array('php', 'txt', 'text', 'js', 'css', 'html', 'htm', 'xml', 'inc', 'include');
 
        /**
-        * Filter file type extensions editable in the plugin editor.
+        * Filters file type extensions editable in the plugin editor.
         *
         * @since 2.8.0
         *
@@ -128,7 +131,7 @@ default:
        'title'         => __('Overview'),
        'content'       =>
                '<p>' . __('You can use the editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.') . '</p>' .
-               '<p>' . __('Choose a plugin to edit from the menu in the upper right and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.') . '</p>' .
+               '<p>' . __('Choose a plugin to edit from the dropdown menu and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.') . '</p>' .
                '<p>' . __('The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function.') . '</p>' .
                '<p id="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p>' .
                '<p>' . __('If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.') . '</p>' .
@@ -168,8 +171,14 @@ default:
 <?php elseif (isset($_GET['phperror'])) : ?>
  <div id="message" class="updated"><p><?php _e('This plugin has been deactivated because your changes resulted in a <strong>fatal error</strong>.') ?></p>
        <?php
-               if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $file) ) { ?>
-       <iframe style="border:0" width="100%" height="70px" src="<?php bloginfo('wpurl'); ?>/wp-admin/plugins.php?action=error_scrape&amp;plugin=<?php echo esc_attr($file); ?>&amp;_wpnonce=<?php echo esc_attr($_GET['_error_nonce']); ?>"></iframe>
+               if ( wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $file ) ) {
+                       $iframe_url = add_query_arg( array(
+                               'action'   => 'error_scrape',
+                               'plugin'   => urlencode( $file ),
+                               '_wpnonce' => urlencode( $_GET['_error_nonce'] ),
+                       ), admin_url( 'plugins.php' ) );
+                       ?>
+       <iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url( $iframe_url ); ?>"></iframe>
        <?php } ?>
 </div>
 <?php endif; ?>
@@ -179,16 +188,22 @@ default:
 <div class="fileedit-sub">
 <div class="alignleft">
 <big><?php
-       if ( is_plugin_active($plugin) ) {
-               if ( is_writeable($real_file) )
-                       echo sprintf(__('Editing <strong>%s</strong> (active)'), $file);
-               else
-                       echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file);
+       if ( is_plugin_active( $plugin ) ) {
+               if ( is_writeable( $real_file ) ) {
+                       /* translators: %s: plugin file name */
+                       echo sprintf( __( 'Editing %s (active)' ), '<strong>' . $file . '</strong>' );
+               } else {
+                       /* translators: %s: plugin file name */
+                       echo sprintf( __( 'Browsing %s (active)' ), '<strong>' . $file . '</strong>' );
+               }
        } else {
-               if ( is_writeable($real_file) )
-                       echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file);
-               else
-                       echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file);
+               if ( is_writeable( $real_file ) ) {
+                       /* translators: %s: plugin file name */
+                       echo sprintf( __( 'Editing %s (inactive)' ), '<strong>' . $file . '</strong>' );
+               } else {
+                       /* translators: %s: plugin file name */
+                       echo sprintf( __( 'Browsing %s (inactive)' ), '<strong>' . $file . '</strong>' );
+               }
        }
        ?></big>
 </div>
@@ -216,7 +231,7 @@ default:
 </div>
 
 <div id="templateside">
-       <h3><?php _e('Plugin Files'); ?></h3>
+       <h2><?php _e( 'Plugin Files' ); ?></h2>
 
        <ul>
 <?php
@@ -245,7 +260,7 @@ foreach ( $plugin_files as $plugin_file ) :
                <input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
                </div>
                <?php if ( !empty( $docs_select ) ) : ?>
-               <div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'http://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" /></div>
+               <div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" /></div>
                <?php endif; ?>
 <?php if ( is_writeable($real_file) ) : ?>
        <?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>