From 6eec7957923b57a23070e6fb894fdab79de0766f Mon Sep 17 00:00:00 2001 From: patrickebates Date: Fri, 26 Sep 2014 11:31:02 -0500 Subject: [PATCH 1/4] Remove use of wpdb->prepare which is no longer needed --- wp-admin/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-admin/install.php b/wp-admin/install.php index 70d9df491..0a4062933 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -86,7 +86,7 @@ function display_header( $body_classes = '' ) { function display_setup_form( $error = null ) { global $wpdb; - $sql = $wpdb->prepare( "SELECT name FROM sysobjects WHERE type='u' AND name = '$wpdb->users'" ); + $sql = "SELECT name FROM sysobjects WHERE type='u' AND name = '$wpdb->users'"; $user_table = ( $wpdb->get_var( $sql ) != null ); // Ensure that Blogs appear in search engines by default. From e89be5d04e5b3d85d43c351eb9e571b0b243aec7 Mon Sep 17 00:00:00 2001 From: Patrick Bates Date: Sun, 2 Nov 2014 15:30:45 -0600 Subject: [PATCH 2/4] Add support for detecting database settings from WebSites App Settings --- wp-admin/setup-config.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index 466b72a93..c22f70bcc 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -155,22 +155,22 @@ function setup_config_display_header( $body_classes = array() ) { - + - + - + - + @@ -275,10 +275,16 @@ function setup_config_display_header( $body_classes = array() ) { switch ( $constant ) { case 'DB_NAME' : + $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "( getenv('ProjectNami.DBName') ? getenv('ProjectNami.DBName') : '" . addcslashes( constant( $constant ), "\\'" ) . "'));\r\n"; + break; case 'DB_USER' : + $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "( getenv('ProjectNami.DBUser') ? getenv('ProjectNami.DBUser') : '" . addcslashes( constant( $constant ), "\\'" ) . "'));\r\n"; + break; case 'DB_PASSWORD' : + $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "( getenv('ProjectNami.DBPass') ? getenv('ProjectNami.DBPass') : '" . addcslashes( constant( $constant ), "\\'" ) . "'));\r\n"; + break; case 'DB_HOST' : - $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n"; + $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "( getenv('ProjectNami.DBHost') ? getenv('ProjectNami.DBHost') : '" . addcslashes( constant( $constant ), "\\'" ) . "'));\r\n"; break; case 'AUTH_KEY' : case 'SECURE_AUTH_KEY' : From 235eb5dc94e01da4da1176c2b0ac80b087c955a1 Mon Sep 17 00:00:00 2001 From: Patrick Bates Date: Wed, 12 Nov 2014 22:42:20 -0600 Subject: [PATCH 3/4] Set version to 0.10.1 --- wp-includes/pn-version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-includes/pn-version.php b/wp-includes/pn-version.php index 74dd008f1..19e9ff822 100644 --- a/wp-includes/pn-version.php +++ b/wp-includes/pn-version.php @@ -1,5 +1,5 @@ From eea3e0824cbb81b7111fae73668d4917b220e7d7 Mon Sep 17 00:00:00 2001 From: Patrick Bates Date: Wed, 12 Nov 2014 22:43:04 -0600 Subject: [PATCH 4/4] Set version to 0.10.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7654b8172..56d08487f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Project Nami =============== -###Version: `0.10.0`### +###Version: `0.10.1`### ###Description:###
" />
" /> Note: If using SQL Azure, username is of the form username@servername.' ); ?>
" autocomplete="off" />
" /> localhost does not work.' ); ?>