2.3.35

kenzik · Jul 7, 2016 · 76b5cac · 76b5cac
1 parent 490aacd
commit 76b5cac
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -127,6 +127,12 @@ grunt
 - Disable some or all of the default Genesis theme option meta boxes (template, some disabled by default)
 
 ## Changelog
+### 2.3.35 (July 7, 2016)
+- `pre_get_posts` is an action, not a filter
+- Higher specificity on `bfg_replace_login_logo()`
+- Remove `wp_shortlink_wp_head()`
+- Add `bfg_add_tinymce_plugins()` (disabled by default)
+
 ### 2.3.34 (June 28, 2016)
 - Upgrade `jQuery` version to 3.0.0
 - Add `jQuery` to bower and use this version for non-CDN fallback, instead of WP's version

diff --git a/includes/admin/admin-branding.php b/includes/admin/admin-branding.php
@@ -40,7 +40,7 @@ function bfg_login_headertitle() {
 function bfg_replace_login_logo() {
 
 	?><style type="text/css">
-		.login h1 a {
+		body.login h1 a {
 			background-image: url(<?php echo get_stylesheet_directory_uri() ?>/build/images/login-logo.svg);
 
 			/* Adjust to the dimensions of your logo. WP Default: 80px 80px */

diff --git a/includes/admin/admin-views.php b/includes/admin/admin-views.php
@@ -141,6 +141,34 @@ function bfg_add_editor_style() {
 
 }
 
+// add_filter( 'mce_external_plugins', 'bfg_add_tinymce_plugins' );
+/*
+ * Add a plugin script for TinyMCE
+ *
+ * @since 2.3.35
+ */
+function bfg_add_tinymce_plugins( $plugin_array ) {
+
+	$use_production_assets = genesis_get_option('bfg_production_on');
+	$use_production_assets = !empty($use_production_assets);
+
+	$assets_version = genesis_get_option('bfg_assets_version');
+	$assets_version = !empty($assets_version) ? absint($assets_version) : null;
+
+	$src = $use_production_assets ? '/build/js/tinymce.min.js' : '/build/js/tinymce.js';
+	$src = add_query_arg(
+		array(
+			'ver' => $assets_version,
+		),
+		$src
+	);
+
+	$plugin_array['bfg_admin'] = get_stylesheet_directory_uri() . $src;
+
+	return $plugin_array;
+
+}
+
 add_filter( 'tiny_mce_before_init', 'bfg_tiny_mce_before_init' );
 /**
  * Modifies the TinyMCE settings array.

diff --git a/includes/structure/header.php b/includes/structure/header.php
@@ -15,6 +15,7 @@
 remove_action( 'wp_head', 'wlwmanifest_link');							// WLW Manifest
 // remove_action( 'wp_head', 'feed_links', 2 ); 						// Remove feed links
 remove_action( 'wp_head', 'feed_links_extra', 3 ); 						// Remove comment feed links
+remove_action( 'wp_head', 'wp_shortlink_wp_head', 10, 0 );				// Remove shortlink
 
 // Remove WP-API <head> material
 // See: https://wordpress.stackexchange.com/questions/211467/remove-json-api-links-in-header-html

diff --git a/includes/structure/search.php b/includes/structure/search.php
@@ -50,7 +50,7 @@ function bfg_redirect_single_search_result() {
 
 }
 
-// add_filter( 'pre_get_posts', 'bfg_only_search_posts' );
+// add_action( 'pre_get_posts', 'bfg_only_search_posts' );
 /**
  * Limit searching to just posts, excluding pages and CPTs.
  *
@@ -60,10 +60,11 @@ function bfg_redirect_single_search_result() {
  */
 function bfg_only_search_posts( $query ) {
 
+	if( is_admin() )
+		return;
+
 	if( $query->is_search ) {
 		$query->set( 'post_type', 'post' );
 	}
 
-	return $query;
-
 }
diff --git a/style.css b/style.css
@@ -8,7 +8,7 @@
 	Tags: left-sidebar, right-sidebar, flexible-width, custom-menu, editor-style, featured-images, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments
 
 	Template: genesis
-	Template Version: 2.2.7
+	Template Version: 2.3.0
 
 	License: WTFPL
 	License URI: http://www.wtfpl.net/txt/copying/