Skip to content

Commit

Permalink
Move rest api loads into conditional that confirms in rest mode (#6649)
Browse files Browse the repository at this point in the history
* Move rest api loads into conditional that confirms in rest mode

The rest api files should only be loaded if the site is in rest server mode.
I initially tested using
    `defined( 'REST_REQUEST') && REST_REQUEST`

however this wasn't detected and created errors, thus use of class_exists
checking for WP_REST_Controller
  • Loading branch information
mkaz authored May 9, 2018
1 parent 5b2fd3e commit 65aaac8
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions lib/load.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,26 @@
die( 'Silence is golden.' );
}

// These files only need to be loaded if within a rest server instance
// which this class will exist if that is the case.
if ( class_exists( 'WP_REST_Controller' ) ) {
require dirname( __FILE__ ) . '/class-wp-rest-blocks-controller.php';
require dirname( __FILE__ ) . '/class-wp-rest-block-renderer-controller.php';
require dirname( __FILE__ ) . '/rest-api.php';
}

require dirname( __FILE__ ) . '/meta-box-partial-page.php';
require dirname( __FILE__ ) . '/class-wp-block-type.php';
require dirname( __FILE__ ) . '/class-wp-block-type-registry.php';
require dirname( __FILE__ ) . '/class-wp-rest-blocks-controller.php';
require dirname( __FILE__ ) . '/class-wp-rest-block-renderer-controller.php';
require dirname( __FILE__ ) . '/blocks.php';
require dirname( __FILE__ ) . '/client-assets.php';
require dirname( __FILE__ ) . '/compat.php';
require dirname( __FILE__ ) . '/rest-api.php';
require dirname( __FILE__ ) . '/plugin-compat.php';
require dirname( __FILE__ ) . '/i18n.php';
require dirname( __FILE__ ) . '/parser.php';
require dirname( __FILE__ ) . '/register.php';


// Register server-side code for individual blocks.
foreach ( glob( dirname( __FILE__ ) . '/../core-blocks/*/index.php' ) as $block_logic ) {
require $block_logic;
Expand Down

0 comments on commit 65aaac8

Please sign in to comment.