From f2fddcb3c9fca4e7f166142d7a20c1a9b44d1e35 Mon Sep 17 00:00:00 2001
From: Jonathan Buttigieg <contact@geekpress.fr>
Date: Thu, 8 Jan 2015 16:45:22 +0100
Subject: [PATCH] commit 1.4

---
 README.md                            |  7 ++++++-
 wp-quick-install/assets/js/script.js |  4 ++++
 wp-quick-install/data.ini            |  1 +
 wp-quick-install/index.php           | 19 ++++++++++++++++---
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 61ad9a5..8aa2aff 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,11 @@ Simply download the .zip archive et go to *wp-quick-install/index.php*
 Changelog
 ================
 
+1.4
+-----------
+* Fix database issue since WordPress 4.1
+* You can add your WordPress.com API Key
+
 1.3.3
 -----------
 
@@ -63,7 +68,7 @@ Changelog
 * You can enable extension after installation
 * Auto supression of Hello Dolly extension
 * You can add a theme and enable it
-* PYou can delete Twenty Elever and Twenty Ten
+* You can delete Twenty Elever and Twenty Ten
 
 1.2.6
 -----------
diff --git a/wp-quick-install/assets/js/script.js b/wp-quick-install/assets/js/script.js
index 5efb4c2..c29e7d3 100644
--- a/wp-quick-install/assets/js/script.js
+++ b/wp-quick-install/assets/js/script.js
@@ -214,6 +214,10 @@ $(document).ready(function() {
 				$('#debug').removeAttr('checked');
 			}
 		}
+		
+		if ( typeof data.wp_config.wpcom_api_key !='undefined' ) {
+			$('#wpcom_api_key').val(data.wp_config.wpcom_api_key);
+		}
 
 	}
 
diff --git a/wp-quick-install/data.ini b/wp-quick-install/data.ini
index 7bd0b66..7b5f8c8 100644
--- a/wp-quick-install/data.ini
+++ b/wp-quick-install/data.ini
@@ -117,6 +117,7 @@
 ;wp_config['disallow_file_edit'] = 1
 ;wp_config['autosave_interval']  = 7200
 ;wp_config['debug']              = 1
+;wp_config['wpcom_api_key']      = 
 
 
 ;;;;
diff --git a/wp-quick-install/index.php b/wp-quick-install/index.php
index dfecded..89f46b9 100755
--- a/wp-quick-install/index.php
+++ b/wp-quick-install/index.php
@@ -4,9 +4,9 @@
 Author: Jonathan Buttigieg
 Contributors: Julio Potier
 Script URI: http://wp-quick-install.com
-Version: 1.3.1
+Version: 1.3.4
 Licence: GPLv3
-Last Update: 11 jul 14
+Last Update: 08 jan 15
 */
 
 @set_time_limit( 0 );
@@ -212,6 +212,11 @@
 								$line .= "\r\n\n " . "/** Intervalle des sauvegardes automatique */" . "\r\n";
 								$line .= "define('AUTOSAVE_INTERVAL', " . (int) $_POST['autosave_interval'] . ");";
 							}
+							
+							if ( ! empty( $_POST['wpcom_api_key'] ) ) {
+								$line .= "\r\n\n " . "/** WordPress.com API Key */" . "\r\n";
+								$line .= "define('WPCOM_API_KEY', " . $_POST['wpcom_api_key'] . ");";
+							}
 
 							$line .= "\r\n\n " . "/** On augmente la mémoire limite */" . "\r\n";
 							$line .= "define('WP_MEMORY_LIMIT', '96M');" . "\r\n";
@@ -264,6 +269,8 @@
 				/*	Let's install WordPress database
 				/*--------------------------*/
 
+				define( 'WP_INSTALLING', true );
+				
 				/** Load WordPress Bootstrap */
 				require_once( $directory . 'wp-load.php' );
 
@@ -737,7 +744,7 @@
 							<p><?php echo _('The extension slug is available in the url (Ex: http://wordpress.org/extend/plugins/<strong>wordpress-seo</strong>)');?></p>
 						</th>
 						<td>
-							<input name="plugins" type="text" id="plugins" size="50" value="" />
+							<input name="plugins" type="text" id="plugins" size="50" value="wp-website-monitoring; rocket-lazy-load" />
 							<p><?php echo _('Make sure that the extensions slugs are separated by a semicolon (;).');?></p>
 						</td>
 					</tr>
@@ -858,6 +865,12 @@
 							</div>
 						</td>
 					</tr>
+					<tr>
+						<th scope="row">
+							<label for="wpcom_api_key"><?php echo _('WP.com API Key');?></label>
+						</th>
+						<td><input name="wpcom_api_key" id="wpcom_api_key" type="text" size="25" value="" /></td>
+					</tr>
 				</table>
 				<p class="step"><span id="submit" class="button button-large"><?php echo _('Install WordPress');?></span></p>