Merge branch 'release/1.4.1'

ClassicPress · Apr 3, 2022 · 413efce · 413efce
2 parents 815f84f + 0439011
commit 413efce
Show file tree

Hide file tree

Showing 46 changed files with 31,634 additions and 34,057 deletions.
diff --git a/wp-admin/about.php b/wp-admin/about.php
@@ -152,7 +152,7 @@ classicpress_version()
 				<?php
 				printf(
 					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
+					__( '<strong>WordPress version %s</strong> addressed some security issues.' ),
 					'4.9.19'
 				);
 				?>

diff --git a/wp-admin/themes.php b/wp-admin/themes.php
@@ -448,6 +448,8 @@
 					<div class="update-message notice inline notice-warning notice-alt"><p><?php _e( 'New version available.' ); ?></p></div>
 				<# } #>
 			<# } #>
+		</div>
+	<# } #>
 
 	<# if ( data.hasUpdate ) { #>
 		<# if ( data.updateResponse.compatibleWP && data.updateResponse.compatiblePHP ) { #>

diff --git a/wp-includes/PHPMailer/Exception.php b/wp-includes/PHPMailer/Exception.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -448,6 +448,8 @@ @@
     					<div class="update-message notice inline notice-warning notice-alt"><p><?php _e( 'New version available.' ); ?></p></div>
     				<# } #>
     			<# } #>
+    		</div>
+    	<# } #>
     	<# if ( data.hasUpdate ) { #>
     		<# if ( data.updateResponse.compatibleWP && data.updateResponse.compatiblePHP ) { #>
@@ Expand Down @@