Merge pull request #596 from NHSLeadership/develop

v2.5.1

README.md

@@ -1,5 +1,5 @@
-# Nightingale 2.5.0
-<img src="https://img.shields.io/badge/nightingale-v2.5.0-blue"> 
+# Nightingale 2.5.1
+<img src="https://img.shields.io/badge/nightingale-v2.5.1-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>
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "nhsleadership/nightingale",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "description": " NHSUK Frontend style theme for WordPress",
     "repositories":[{"type":"composer","url":"https://wpackagist.org"}],
     "type": "wordpress-theme",

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.0 31 jul 2023
+ * @version   2.5.1 19 sep 2023
  */
 
 /**

inc/template-tags.php

@@ -144,7 +144,7 @@ function nightingale_post_thumbnail() {
 		endif; // End is_singular().
 	}
 endif;
-
+if ( ! function_exists( 'nightingale_comment_display' ) ) :
 /**
  * Display Comments.
  *
@@ -215,7 +215,8 @@ function nightingale_comment_display( $comment, $args, $depth ) {
 		echo '</div>';
 	endif;
 }
-
+endif;
+if ( ! function_exists( 'nightingale_reply_icon' ) ) :
 /**
  * Create an icon for replies
  *
@@ -226,7 +227,8 @@ function nightingale_reply_icon() {
 							<path d="M14.999,8.543c0,0.229-0.188,0.417-0.416,0.417H5.417C5.187,8.959,5,8.772,5,8.543s0.188-0.417,0.417-0.417h9.167C14.812,8.126,14.999,8.314,14.999,8.543 M12.037,10.213H5.417C5.187,10.213,5,10.4,5,10.63c0,0.229,0.188,0.416,0.417,0.416h6.621c0.229,0,0.416-0.188,0.416-0.416C12.453,10.4,12.266,10.213,12.037,10.213 M14.583,6.046H5.417C5.187,6.046,5,6.233,5,6.463c0,0.229,0.188,0.417,0.417,0.417h9.167c0.229,0,0.416-0.188,0.416-0.417C14.999,6.233,14.812,6.046,14.583,6.046 M17.916,3.542v10c0,0.229-0.188,0.417-0.417,0.417H9.373l-2.829,2.796c-0.117,0.116-0.71,0.297-0.71-0.296v-2.5H2.5c-0.229,0-0.417-0.188-0.417-0.417v-10c0-0.229,0.188-0.417,0.417-0.417h15C17.729,3.126,17.916,3.313,17.916,3.542 M17.083,3.959H2.917v9.167H6.25c0.229,0,0.417,0.187,0.417,0.416v1.919l2.242-2.215c0.079-0.077,0.184-0.12,0.294-0.12h7.881V3.959z"></path>
 						</svg> Reply';
 }
-
+endif;
+if ( ! function_exists( 'nightingale_edit_icon' ) ) :
 /**
  * Create an icon for editing.
  */
@@ -235,7 +237,8 @@ function nightingale_edit_icon() {
 							<path d="M19.404,6.65l-5.998-5.996c-0.292-0.292-0.765-0.292-1.056,0l-2.22,2.22l-8.311,8.313l-0.003,0.001v0.003l-0.161,0.161c-0.114,0.112-0.187,0.258-0.21,0.417l-1.059,7.051c-0.035,0.233,0.044,0.47,0.21,0.639c0.143,0.14,0.333,0.219,0.528,0.219c0.038,0,0.073-0.003,0.111-0.009l7.054-1.055c0.158-0.025,0.306-0.098,0.417-0.211l8.478-8.476l2.22-2.22C19.695,7.414,19.695,6.941,19.404,6.65z M8.341,16.656l-0.989-0.99l7.258-7.258l0.989,0.99L8.341,16.656z M2.332,15.919l0.411-2.748l4.143,4.143l-2.748,0.41L2.332,15.919z M13.554,7.351L6.296,14.61l-0.849-0.848l7.259-7.258l0.423,0.424L13.554,7.351zM10.658,4.457l0.992,0.99l-7.259,7.258L3.4,11.715L10.658,4.457z M16.656,8.342l-1.517-1.517V6.823h-0.003l-0.951-0.951l-2.471-2.471l1.164-1.164l4.942,4.94L16.656,8.342z"></path>
 						</svg> Edit';
 }
-
+endif;
+if ( ! function_exists( 'nightingale_comment_reply_text' ) ) :
 /**
  * Change the reply text to include an SVG.
  *
@@ -248,7 +251,8 @@ function nightingale_comment_reply_text( $link ) {
 
 	return $link;
 }
-
+endif;
+if ( ! function_exists( 'nightingale_remove_image_size_attributes' ) ) :
 add_filter( 'comment_reply_link', 'nightingale_comment_reply_text' );
 
 /**
@@ -261,6 +265,7 @@ function nightingale_comment_reply_text( $link ) {
 function nightingale_remove_image_size_attributes( $html ) {
 	return preg_replace( '/(width|height)="\d*"/', '', $html );
 }
+endif;
 
 // Remove image size attributes from post thumbnails.
 add_filter( 'post_thumbnail_html', 'nightingale_remove_image_size_attributes' );

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.0 31st July 2023
+ * @version   2.5.1 19th September 2023
  */
 
 get_header();

package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/NHSLeadership/nightingale-2-0.git"
   },
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -19,6 +19,6 @@
   "dependencies": {
     "nhsuk-frontend": "^7.0.0",
     "penthouse": "^2.3.2",
-    "sass": "^1.49.9"
+    "sass": "^1.67.0"
   }
 }

page.php

@@ -45,4 +45,3 @@
 <?php
 flush();
 get_footer();
-?>

readme.txt

@@ -6,7 +6,7 @@ Requires PHP: 5.6
 License: GPL v3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
 Theme URI: https://digital.leadershipacademy.nhs.uk/digital-capabilities/websites/nightingale-theme-user-guide/
-Version: 2.5.0
+Version: 2.5.1
 Stable tag: 2.5
 
 
@@ -43,6 +43,11 @@ one level only. To show further levels, we recommend using the right (or left) h
 
 == Changelog
 
+=2.5.1=
+* Vulnerability fixes.
+* Node package updates
+* Code improvements
+
 =2.5.0=
 * Updated nhsuk-frontend to verion 7.0.0