Changeset 2019336 for classic-editor

Timestamp:

01/25/2019 09:42:32 PM (7 years ago)

Author:

azaozz

Message:

Classic Editor 1.4-beta1

Location:

classic-editor/trunk

Files:

• LICENSE.md (modified) (1 diff)
• classic-editor.php (modified) (13 diffs)
• readme.txt (modified) (3 diffs)
• screenshot-1.png (deleted)
• screenshot-2.png (deleted)
• screenshot-3.png (deleted)
• screenshot-4.png (deleted)
• screenshot-5.png (deleted)
• screenshot-6.png (deleted)

classic-editor/trunk/LICENSE.md

@@ -1 +1 @@
 ### WordPress - Web publishing software
 
-    Copyright 2011-2018 by the contributors
+    Copyright 2011-2019 by the contributors
 
 This program is free software; you can redistribute it and/or modify

classic-editor/trunk/classic-editor.php

@@ -6 +6 @@
  * Plugin URI:  https://wordpress.org/plugins/classic-editor/
  * Description: Enables the WordPress classic editor and the old-style Edit Post screen with TinyMCE, Meta Boxes, etc. Supports the older plugins that extend this screen.
- * Version:     1.3
+ * Version:     1.4-beta1
  * Author:      WordPress Contributors
  * Author URI:  https://github.com/WordPress/classic-editor/
@@ -13 +13 @@
  * Text Domain: classic-editor
  * Domain Path: /languages
- * Network:     true
  *
  * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
@@ -29 +28 @@
 if ( ! class_exists( 'Classic_Editor' ) ) :
 class Classic_Editor {
-    const plugin_version = 1.2;
     private static $settings;
     private static $supported_post_types = array();
@@ -50 +48 @@
 
         if ( ! $settings['hide-settings-ui'] ) {
-            // Show the plugin's admin settings, and a link to them in the plugins list table.
+            // Add a link to the plugin's settings and/or network admin settings in the plugins list table.
             add_filter( 'plugin_action_links', array( __CLASS__, 'add_settings_link' ), 10, 2 );
+            add_filter( 'network_admin_plugin_action_links', array( __CLASS__, 'add_settings_link' ), 10, 2 );
+
             add_action( 'admin_init', array( __CLASS__, 'register_settings' ) );
 
@@ -201 +201 @@
         if ( is_multisite() ) {
             $defaults = array(
-                'editor' => 'classic',
+                'editor' => get_network_option( null, 'classic-editor-replace' ) === 'block' ? 'block' : 'classic',
                 'allow-users' => false,
             );
@@ -435 +435 @@
 
     public static function network_settings() {
-        $is_checked =  ( get_network_option( null, 'classic-editor-allow-sites' ) === 'allow' );
+        $editor = get_network_option( null, 'classic-editor-replace' );
+        $is_checked = ( get_network_option( null, 'classic-editor-allow-sites' ) === 'allow' );
 
         ?>
+        <h2 id="classic-editor-options"><?php _e( 'Editor Settings', 'classic-editor' ); ?></h2>
         <table class="form-table">
+            <?php wp_nonce_field( 'allow-site-admin-settings', 'classic-editor-network-settings' ); ?>
             <tr>
-                <th scope="row"><?php _ex( 'Classic Editor', 'Editor Name', 'classic-editor' ); ?></th>
+                <th scope="row"><?php _e( 'Default editor for all sites', 'classic-editor' ); ?></th>
                 <td>
-                <?php wp_nonce_field( 'allow-site-admin-settings', 'classic-editor-network-settings' ); ?>
-                <input type="checkbox" name="classic-editor-allow-sites" id="classic-editor-allow-sites" value="allow"<?php if ( $is_checked ) echo ' checked'; ?>>
-                <label for="classic-editor-allow-sites"><?php _e( 'Allow site admins to change settings', 'classic-editor' ); ?></label>
-                <p class="description"><?php _e( 'By default the Block Editor is replaced with the Classic Editor and users cannot switch editors.', 'classic-editor' ); ?></p>
+                    <p>
+                        <input type="radio" name="classic-editor-replace" id="classic-editor-classic" value="classic"<?php if ( $editor !== 'block' ) echo ' checked'; ?> />
+                        <label for="classic-editor-classic"><?php _ex( 'Classic Editor', 'Editor Name', 'classic-editor' ); ?></label>
+                    </p>
+                    <p>
+                        <input type="radio" name="classic-editor-replace" id="classic-editor-block" value="block"<?php if ( $editor === 'block' ) echo ' checked'; ?> />
+                        <label for="classic-editor-block"><?php _ex( 'Block Editor', 'Editor Name', 'classic-editor' ); ?></label>
+                    </p>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row"><?php _e( 'Change settings', 'classic-editor' ); ?></th>
+                <td>
+                    <input type="checkbox" name="classic-editor-allow-sites" id="classic-editor-allow-sites" value="allow"<?php if ( $is_checked ) echo ' checked'; ?>>
+                    <label for="classic-editor-allow-sites"><?php _e( 'Allow site admins to change settings', 'classic-editor' ); ?></label>
+                    <p class="description"><?php _e( 'By default the Block Editor is replaced with the Classic Editor and users cannot switch editors.', 'classic-editor' ); ?></p>
                 </td>
             </tr>
@@ -458 +473 @@
             wp_verify_nonce( $_POST['classic-editor-network-settings'], 'allow-site-admin-settings' )
         ) {
+            if ( isset( $_POST['classic-editor-replace'] ) && $_POST['classic-editor-replace'] === 'block' ) {
+                update_network_option( null, 'classic-editor-replace', 'block' );
+            } else {
+                update_network_option( null, 'classic-editor-replace', 'classic' );
+            }
             if ( isset( $_POST['classic-editor-allow-sites'] ) && $_POST['classic-editor-allow-sites'] === 'allow' ) {
                 update_network_option( null, 'classic-editor-allow-sites', 'allow' );
@@ -473 +493 @@
             $pagenow !== 'about.php' ||
             $settings['hide-settings-ui'] ||
-            $settings['editor'] === 'block' || 
+            $settings['editor'] === 'block' ||
             $settings['allow-users'] ||
             ! current_user_can( 'edit_posts' )
@@ -486 +506 @@
 
         if ( current_user_can( 'manage_options' ) ) {
-            $message .= ' ' . sprintf( __( 'Change the %1$sClassic Editor settings%2$s.', 'classic-editor' ), '<a href="options-writing.php#classic-editor-options">', '</a>' );
+            if ( is_network_admin() ) {
+                $url = 'settings.php#classic-editor-options';
+            } else {
+                $url = 'options-writing.php#classic-editor-options';
+            }
+
+            $message .= ' ' . sprintf( __( 'Change the %1$sClassic Editor settings%2$s.', 'classic-editor' ), sprintf( '<a href="%s">', $url ), '</a>' );
         }
 
@@ -661 +687 @@
             plugins_url( 'js/block-editor-plugin.js', __FILE__ ),
             array( 'wp-element', 'wp-components', 'lodash' ),
-            self::plugin_version,
+            '1.4',
             true
         );
@@ -679 +705 @@
 
         if ( $file === 'classic-editor/classic-editor.php' && ! $settings['hide-settings-ui'] && current_user_can( 'manage_options' ) ) {
-            (array) $links[] = sprintf( '<a href="%s">%s</a>', admin_url( 'options-writing.php#classic-editor-options' ), __( 'Settings', 'classic-editor' ) );
+            if ( current_filter() === 'plugin_action_links' ) {
+                $url = admin_url( 'options-writing.php#classic-editor-options' );
+            } else {
+                $url = admin_url( '/network/settings.php#classic-editor-options' );
+            }
+
+            // Prevent warnings in PHP 7.0+ when a plugin uses this filter incorrectly.
+            $links = (array) $links;
+            $links[] = sprintf( '<a href="%s">%s</a>', $url, __( 'Settings', 'classic-editor' ) );
         }
 
@@ -885 +919 @@
     public static function activate() {
         if ( is_multisite() ) {
+            add_network_option( null, 'classic-editor-replace', 'classic' );
             add_network_option( null, 'classic-editor-allow-sites', 'disallow' );
         }
@@ -897 +932 @@
     public static function uninstall() {
         if ( is_multisite() ) {
+            delete_network_option( null, 'classic-editor-replace' );
             delete_network_option( null, 'classic-editor-allow-sites' );
         }

classic-editor/trunk/readme.txt

@@ -29 +29 @@
 
 == Changelog ==
+
+= 1.4 =
+* On network installations removed the restriction for only network activation.
+* Added support for network administrators to choose the default network-wide editor.
+* Fixed the settings link in the warning on network About screen.
 
 = 1.3 =
@@ -80 +85 @@
 Initial release.
 
+== Frequently Asked Questions ==
+
+= Default settings =
+
+When activated this plugin will restore the previous ("classic") WordPress editor and hide the new Block Editor ("Gutenberg").
+These settings can be changed at the Settings => Writing screen.
+
+= Default settings for network installation =
+
+There are two options:
+
+* When network-activated this plugin will set the Classic Editor as default and prevent site administrators and users from changing editors.
+The settings can be changed and default network-wide editor can be selected on the Network Settings screen.
+* When not network-activated each site administrator will be able to activate the plugin and choose options for their users.
+
 == Screenshots ==
 1. Admin settings on the Settings -> Writing screen.
@@ -86 +106 @@
 4. Link to switch to the Block Editor while editing a post in the Classic Editor. Visible when the users are allowed to switch editors.
 5. Link to switch to the Classic Editor while editing a post in the Block Editor. Visible when the users are allowed to switch editors.
-6. Network setting to allow site admins to change the default options.
+6. Network settings to select the default editor for the network and allow site admins to change it.