Merge pull request #613 from NHSLeadership/develop

V2.5.3 Fix for body class loading in admin
NHSLeadership · Dec 18, 2023 · 300192f · 300192f
2 parents bb8cf54 + 669db43
commit 300192f
Show file tree

Hide file tree

Showing 10 changed files with 658 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# Nightingale 2.5.2
-<img src="https://img.shields.io/badge/nightingale-v2.5.2-blue"> 
+# Nightingale 2.5.3
+<img src="https://img.shields.io/badge/nightingale-v2.5.3-blue"> 
 <a href="https://github.com/nhsuk/nhsuk-frontend">
 <img src="https://img.shields.io/badge/nhsuk--frontend-v6.1.0-blue"></a> <a href="https://www.gnu.org/licenses/gpl-3.0.en.html"><img src="https://img.shields.io/badge/license-GPL%20(%3E%3D3)-green"></a> <a href="https://wordpress.org"><img src="https://img.shields.io/badge/WordPress-v5.5%20%2B-lightgrey"></a> <img src="https://img.shields.io/badge/php-5.6%2B-red"> <img src="https://img.shields.io/badge/pull%20requests-welcome-blueviolet"> <a href="https://wordpress.org/themes/nightingale"><img src="https://img.shields.io/badge/theme%20install-WP%20repo-lightgrey"></a>
 

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "nhsleadership/nightingale",
-    "version": "2.5.2",
+    "version": "2.5.3",
     "description": " NHSUK Frontend style theme for WordPress",
     "repositories":[{"type":"composer","url":"https://wpackagist.org"}],
     "type": "wordpress-theme",

diff --git a/functions.php b/functions.php
@@ -5,7 +5,7 @@
  * @link      https://developer.wordpress.org/themes/basics/theme-functions/
  * @package   Nightingale
  * @copyright NHS Leadership Academy, Tony Blacker
- * @version   2.5.2 01 nov 2023
+ * @version   2.5.3 28 nov 2023
  */
 
 /**

diff --git a/inc/color-picker.php b/inc/color-picker.php
@@ -102,16 +102,15 @@ function nightingale_save_colourpicker( $post_id ) {
  *
  * @link https://wordpress.stackexchange.com/a/154951/17187
  *
- * @param String $classes Current body classes.
+ * @param string $classes Current body classes.
  *
- * @return String          Altered body classes.
+ * @return string          Altered body classes.
  */
 function nightingale_admin_body_class( $classes ) {
 
 	global $pagenow;
-
 	if ( 'post.php' !== $pagenow && 'post-new.php' !== $pagenow ) {
-		return;
+		return "$classes";
 	}
 
 	$page_color = esc_attr( get_post_meta( get_the_id(), 'page-color', true ) );

diff --git a/index.php b/index.php
@@ -9,7 +9,7 @@
  * @link      https://developer.wordpress.org/themes/basics/template-hierarchy/
  * @package   Nightingale
  * @copyright NHS Leadership Academy, Tony Blacker
- * @version   2.5.2 1st November 2023
+ * @version   2.5.3 28th November 2023
  */
 
 get_header();