Merge remote-tracking branch 'refs/remotes/origin/master' into latest

ProjectNami · Aug 15, 2020 · b68584a · b68584a
2 parents 1b39902 + 901848a
commit b68584a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Project Nami
 ===============
 
-### Version: `2.5.0` ###
+### Version: `2.5.1` ###
 
 ### Description: ###
 [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://deploy.azure.com/?repository=https://github.com/ProjectNami/projectnami/tree/latest)

diff --git a/wp-admin/install.php b/wp-admin/install.php
@@ -91,7 +91,8 @@ function display_header( $body_classes = '' ) {
 function display_setup_form( $error = null ) {
 	global $wpdb;
 
-	$user_table = ( $wpdb->get_var( $wpdb->prepare( 'SELECT name FROM sysobjects WHERE type='u' AND name like %s', $wpdb->esc_like( $wpdb->users ) ) ) !== null );
+	$sql        = "SELECT name FROM sysobjects WHERE type='u' AND name = '$wpdb->users'";
+	$user_table = ( $wpdb->get_var( $sql ) !== null );
 
 	// Ensure that sites appear in search engines by default.
 	$blog_public = 1;

diff --git a/wp-includes/pn-version.php b/wp-includes/pn-version.php
@@ -1,3 +1,3 @@
 <?php
 
-$pn_version = '2.5.0';
+$pn_version = '2.5.1';