From 63a62780b9845352fc6fd293561de5d52793141e Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Fri, 31 Aug 2012 01:44:11 +0000
Subject: [PATCH] Rename two fields in the v_users table user_add_date to
 add_date, and user_add_user to add_user. Advanced -> Upgrade Schema.

---
 app/signup/signup.php      |  4 ++--
 core/users/app_config.php  | 10 ++++++----
 core/users/signup.php      |  4 ++--
 includes/lib_functions.php |  4 ++--
 install.php                |  4 ++--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/signup/signup.php b/app/signup/signup.php
index e4a702d8f7..5a7a1a256a 100644
--- a/app/signup/signup.php
+++ b/app/signup/signup.php
@@ -118,8 +118,8 @@ if (count($_POST)>0 && $_POST["persistform"] != "1") {
 	$sql .= "password, ";
 	$sql .= "salt, ";
 	$sql .= "user_email, ";
-	$sql .= "user_add_date, ";
-	$sql .= "user_add_user ";
+	$sql .= "add_date, ";
+	$sql .= "add_user ";
 	$sql .= ")";
 	$sql .= "values ";
 	$sql .= "(";
diff --git a/core/users/app_config.php b/core/users/app_config.php
index 201161d2bc..7939b4abad 100644
--- a/core/users/app_config.php
+++ b/core/users/app_config.php
@@ -164,13 +164,15 @@
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
 		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'user_add_user';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'useradduser';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'add_user';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'user_add_user';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'useradduser';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'user_add_date';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'useradddate';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'add_date';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'user_add_date';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'useradddate';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
 
diff --git a/core/users/signup.php b/core/users/signup.php
index cda7c53da2..f0d0148eaa 100644
--- a/core/users/signup.php
+++ b/core/users/signup.php
@@ -109,8 +109,8 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 	$sql .= "username, ";
 	$sql .= "password, ";
 	$sql .= "salt, ";
-	$sql .= "user_add_date, ";
-	$sql .= "user_add_user, ";
+	$sql .= "add_date, ";
+	$sql .= "add_user, ";
 	$sql .= "user_enabled ";
 	$sql .= ") ";
 	$sql .= "values ";
diff --git a/includes/lib_functions.php b/includes/lib_functions.php
index a448070c6d..55ad257ab6 100644
--- a/includes/lib_functions.php
+++ b/includes/lib_functions.php
@@ -631,8 +631,8 @@
 					$sql .= "password, ";
 					$sql .= "salt, ";
 					if (strlen($user_email) > 0) { $sql .= "user_email, "; }
-					$sql .= "user_add_date, ";
-					$sql .= "user_add_user ";
+					$sql .= "add_date, ";
+					$sql .= "add_user ";
 					$sql .= ")";
 					$sql .= "values ";
 					$sql .= "(";
diff --git a/install.php b/install.php
index c93f01e3b5..265bdf4698 100644
--- a/install.php
+++ b/install.php
@@ -934,8 +934,8 @@ if ($_POST["install_step"] == "3" && count($_POST)>0 && strlen($_POST["persistfo
 			$sql .= "username, ";
 			$sql .= "password, ";
 			$sql .= "salt, ";
-			$sql .= "user_add_date, ";
-			$sql .= "user_add_user ";
+			$sql .= "add_date, ";
+			$sql .= "add_user ";
 			$sql .= ") ";
 			$sql .= "values ";
 			$sql .= "(";