Merge branch 'release/1.5.0'

ClassicPress · Jan 5, 2023 · b45423c · b45423c
2 parents 280acbf + 3ae9739
commit b45423c
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/license.txt b/license.txt
@@ -1,6 +1,6 @@
 ClassicPress - Web publishing software
 
-Copyright © 2018-2022 ClassicPress and contributors
+Copyright © 2018-2023 ClassicPress and contributors
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ and
 
   WordPress - Web publishing software
 
-  Copyright 2003-2022 by the WordPress contributors
+  Copyright 2003-2023 by the WordPress contributors
 
   WordPress is released under the GPL
 

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
@@ -85,6 +85,7 @@ function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {
 		'DomainPath'  => 'Domain Path',
 		'Network'     => 'Network',
 		'RequiresWP'  => 'Requires at least',
+		'RequiresCP'  => 'Requires CP',
 		'RequiresPHP' => 'Requires PHP',
 		'UpdateURI'   => 'Update URI',
 		// Site Wide Only is deprecated in favor of Network.

diff --git a/wp-admin/js/customize-widgets.min.js b/wp-admin/js/customize-widgets.min.js
diff --git a/wp-admin/js/editor-expand.min.js b/wp-admin/js/editor-expand.min.js
diff --git a/wp-admin/js/editor.min.js b/wp-admin/js/editor.min.js
diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js
diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
@@ -53,7 +53,7 @@ function classicpress_asset_version( $type = 'script', $handle = null ) {
 	static $default_version;
 
 	if ( empty( $default_version ) ) {
-		$default_version = 'cp_d9f5b255';
+		$default_version = 'cp_dface6e4';
 	}
 
 	/**

diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -27,7 +27,7 @@
  *
  * @global string $cp_version
  */
-$cp_version = '1.5.0-rc2';
+$cp_version = '1.5.0';
 
 /**
  * The WordPress version string