Merge branch 'release/1.9.7'

.wp-env.json

@@ -0,0 +1,7 @@
+{
+	"core": null,
+	"plugins": [
+		".",
+		"https://downloads.wordpress.org/plugin/query-monitor.zip"
+	]
+}

admin/dashboard/adminer.php

@@ -2,7 +2,7 @@
 
 $pronamic_client = \Pronamic\WordPress\PronamicClient\Plugin::get_instance();
 
-$adminer_url = plugins_url( 'adminer/index.php', $pronamic_client->file );
+$adminer_url = plugins_url( 'adminer/', $pronamic_client->file );
 
 ?>
 <form target="_blank" method="post" action="<?php echo esc_attr( $adminer_url ); ?>">

adminer/.htaccess

@@ -2,3 +2,13 @@
 	Order Allow,Deny
 	Deny from all
 </Files>
+
+<Files index.php>
+	<IfModule !mod_authz_core.c>
+		Allow from all
+	</IfModule>
+
+	<IfModule mod_authz_core.c>
+		Require all granted
+	</IfModule>
+</Files>

classes/Plugin.php

@@ -33,6 +33,8 @@ private function __construct( $file ) {
 
 		add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 100 );
 
+		add_action( 'pronamic_credits', 'pronamic_client_credits' );
+
 		// Filters
 		add_filter( 'wp_headers', array( $this, 'wp_headers' ) );
 
@@ -44,6 +46,7 @@ private function __construct( $file ) {
 			'gravityforms'       => GravityFormsModule::get_instance( $this ),
 			'jetpack'            => JetpackModule::get_instance( $this ),
 			'phpmailer'          => PhpMailerModule::get_instance( $this ),
+			'query-monitor'      => QueryMonitorModule::get_instance( $this ),
 			'scripts'            => ScriptsModule::get_instance( $this ),
 			'yoast'              => YoastModule::get_instance( $this ),
 		);

classes/QueryMonitorModule.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Pronamic\WordPress\PronamicClient;
+
+class QueryMonitorModule {
+	/**
+	 * Instance of this class.
+	 *
+	 * @var YoastModule
+	 */
+	protected static $instance = null;
+
+	/**
+	 * Plugin
+	 *
+	 * @var Plugin
+	 */
+	private $plugin;
+
+	/**
+	 * Constructs and initialize Yoast module.
+	 *
+	 * @param Plugin $plugin
+	 */
+	private function __construct( Plugin $plugin ) {
+		$this->plugin = $plugin;
+
+		\add_action( 'plugins_loaded', array( $this, 'plugins_loaded' ) );
+	}
+
+	/**
+	 * Plugins loaded.
+	 *
+	 * @return void
+	 */
+	public function plugins_loaded() {
+		/**
+		 * Check if Query Monitor is active.
+		 *
+		 * @link https://github.com/johnbillion/query-monitor/blob/60da795c040e0f08850891c74a36b2f566cee14d/query-monitor.php#L36
+		 */
+		if ( ! \defined( 'QM_VERSION' ) ) {
+			return;
+		}
+
+		\add_filter( 'plugin_locale', array( $this, 'plugin_locale' ), 10, 2 );
+	}
+
+	/**
+	 * For English for Query Monitor plugin.
+	 *
+	 * @link https://github.com/johnbillion/query-monitor/blob/60da795c040e0f08850891c74a36b2f566cee14d/classes/QueryMonitor.php#L162-L167
+	 * @link https://github.com/WordPress/wordpress-develop/blob/2bb5679d666474d024352fa53f07344affef7e69/src/wp-includes/l10n.php#L69-L71
+	 * @param string $locale The plugin's current locale.
+	 * @param string $domain Text domain. Unique identifier for retrieving translated strings.
+	 * @return string
+	 */
+	public function plugin_locale( $locale, $domain ) {
+		if ( 'query-monitor' !== $domain ) {
+			return $locale;
+		}
+
+		return 'en_US';
+	}
+
+
+	/**
+	 * Return an instance of this class.
+	 *
+	 * @return object A single instance of this class.
+	 */
+	public static function get_instance( $plugin = false ) {
+		// If the single instance hasn't been set, set it now.
+		if ( null === self::$instance ) {
+			self::$instance = new self( $plugin );
+		}
+
+		return self::$instance;
+	}
+}

includes/credits.php

@@ -29,5 +29,3 @@ function pronamic_client_get_credits() {
 function pronamic_client_credits() {
 	echo pronamic_client_get_credits();
 }
-
-add_action( 'pronamic_credits', 'pronamic_client_credits' );