From e06ee7896e93dfdcb59b149ef9dc882481665b8b Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Fri, 4 Jan 2013 22:02:31 +0000
Subject: [PATCH] Remove a redundant v_meeting_users from the app_config.php
 file. Remove a few trailing spaces on upgrade_domains.php.

---
 app/meetings/app_config.php      | 28 ----------------------------
 core/upgrade/upgrade_domains.php |  4 ++--
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/app/meetings/app_config.php b/app/meetings/app_config.php
index 9af00fb4c5..5af5dbe429 100644
--- a/app/meetings/app_config.php
+++ b/app/meetings/app_config.php
@@ -103,32 +103,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the member type.';
 		$z++;
 
-		$y = 2; //table array index
-		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_meeting_users';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key'] = 'foreign';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'meeting_user_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key'] = 'primary';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'meeting_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key'] = 'foreign';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'user_uuid';
-		$z++;
-
 ?>
\ No newline at end of file
diff --git a/core/upgrade/upgrade_domains.php b/core/upgrade/upgrade_domains.php
index 73169c41d2..184b28681c 100644
--- a/core/upgrade/upgrade_domains.php
+++ b/core/upgrade/upgrade_domains.php
@@ -135,7 +135,7 @@
 			foreach($result_defaults_settings as $row) {
 				$name = $row['default_setting_name'];
 				$category = $row['default_setting_category'];
-				$subcategory = $row['default_setting_subcategory'];	
+				$subcategory = $row['default_setting_subcategory'];
 				if (strlen($subcategory) == 0) {
 					$_SESSION[$category][$name] = $row['default_setting_value'];
 				}
@@ -154,7 +154,7 @@
 			foreach($result as $row) {
 				$name = $row['domain_setting_name'];
 				$category = $row['domain_setting_category'];
-				$subcategory = $row['domain_setting_subcategory'];	
+				$subcategory = $row['domain_setting_subcategory'];
 				if (strlen($subcategory) == 0) {
 					//$$category[$name] = $row['domain_setting_value'];
 					$_SESSION[$category][$name] = $row['domain_setting_value'];