Improve requires so that other plugins can use them (#1179)

pressbooks · Apr 9, 2018 · 22d0a77 · 22d0a77
1 parent f6d6dfc
commit 22d0a77
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 24 deletions.
diff --git a/compatibility.php b/compatibility.php
@@ -131,6 +131,7 @@ function pb_register_activation_hook() {
 function pb_init_autoloader() {
 	static $registered = false;
 	if ( ! $registered ) {
+		require_once( __DIR__ . '/requires.php' );
 		\HM\Autoloader\register_class_path( 'Pressbooks', __DIR__ . '/inc' );
 		$registered = true;
 	}

diff --git a/hooks-admin.php b/hooks-admin.php
@@ -14,15 +14,7 @@
 // Includes
 // -------------------------------------------------------------------------------------------------------------------
 
-require( PB_PLUGIN_DIR . 'inc/admin/analytics/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/admin/dashboard/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/admin/diagnostics/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/admin/fonts/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/admin/laf/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/admin/metaboxes/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/admin/networkmanagers/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/admin/organize/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/admin/plugins/namespace.php' );
+require_once( __DIR__ . '/requires-admin.php' );
 
 // -------------------------------------------------------------------------------------------------------------------
 // Recycle, reduce, reuse

diff --git a/hooks.php b/hooks.php
@@ -17,21 +17,7 @@
 // Includes
 // -------------------------------------------------------------------------------------------------------------------
 
-require( PB_PLUGIN_DIR . 'inc/admin/branding/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/analytics/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/api/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/editor/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/image/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/l10n/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/media/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/metadata/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/posttype/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/redirect/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/registration/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/sanitize/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/theme/namespace.php' );
-require( PB_PLUGIN_DIR . 'inc/utility/namespace.php' );
-
+require_once( __DIR__ . '/requires.php' );
 include_symbionts();
 
 // -------------------------------------------------------------------------------------------------------------------

diff --git a/requires-admin.php b/requires-admin.php
@@ -0,0 +1,15 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+require_once( __DIR__ . '/inc/admin/analytics/namespace.php' );
+require_once( __DIR__ . '/inc/admin/dashboard/namespace.php' );
+require_once( __DIR__ . '/inc/admin/diagnostics/namespace.php' );
+require_once( __DIR__ . '/inc/admin/fonts/namespace.php' );
+require_once( __DIR__ . '/inc/admin/laf/namespace.php' );
+require_once( __DIR__ . '/inc/admin/metaboxes/namespace.php' );
+require_once( __DIR__ . '/inc/admin/networkmanagers/namespace.php' );
+require_once( __DIR__ . '/inc/admin/organize/namespace.php' );
+require_once( __DIR__ . '/inc/admin/plugins/namespace.php' );
diff --git a/requires.php b/requires.php
@@ -0,0 +1,20 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+require_once( __DIR__ . '/inc/admin/branding/namespace.php' );
+require_once( __DIR__ . '/inc/analytics/namespace.php' );
+require_once( __DIR__ . '/inc/api/namespace.php' );
+require_once( __DIR__ . '/inc/editor/namespace.php' );
+require_once( __DIR__ . '/inc/image/namespace.php' );
+require_once( __DIR__ . '/inc/l10n/namespace.php' );
+require_once( __DIR__ . '/inc/media/namespace.php' );
+require_once( __DIR__ . '/inc/metadata/namespace.php' );
+require_once( __DIR__ . '/inc/posttype/namespace.php' );
+require_once( __DIR__ . '/inc/redirect/namespace.php' );
+require_once( __DIR__ . '/inc/registration/namespace.php' );
+require_once( __DIR__ . '/inc/sanitize/namespace.php' );
+require_once( __DIR__ . '/inc/theme/namespace.php' );
+require_once( __DIR__ . '/inc/utility/namespace.php' );