From 38608bfa62ff9bed744759969345339bd6c60fbf Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 2 Feb 2014 17:59:52 +0100
Subject: [PATCH] [ticket/12115] Remove occupation field from html files

PHPBB3-12115
---
 phpBB/adm/style/acp_users_profile.html                        | 4 ----
 phpBB/styles/prosilver/template/memberlist_view.html          | 1 -
 phpBB/styles/prosilver/template/ucp_profile_profile_info.html | 4 ----
 phpBB/styles/subsilver2/template/memberlist_view.html         | 4 ----
 .../styles/subsilver2/template/ucp_profile_profile_info.html  | 4 ----
 5 files changed, 17 deletions(-)

diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
index cad1dca9d8..119b3c4be4 100644
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -30,10 +30,6 @@
 		<dt><label for="location">{L_LOCATION}{L_COLON}</label></dt>
 		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="occupation">{L_OCCUPATION}{L_COLON}</label></dt>
-		<dd><textarea id="occupation" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></dd>
-	</dl>
 	<dl>
 		<dt><label for="interests">{L_INTERESTS}{L_COLON}</label></dt>
 		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index afe93ef9ac..f580e07879 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -29,7 +29,6 @@
 		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}{L_COLON}</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF -->
 		<!-- IF LOCATION --><dt>{L_LOCATION}{L_COLON}</dt> <dd>{LOCATION}</dd><!-- ENDIF -->
 		<!-- IF AGE !== '' --><dt>{L_AGE}{L_COLON}</dt> <dd>{AGE}</dd><!-- ENDIF -->
-		<!-- IF OCCUPATION --><dt>{L_OCCUPATION}{L_COLON}</dt> <dd>{OCCUPATION}</dd><!-- ENDIF -->
 		<!-- IF INTERESTS --><dt>{L_INTERESTS}{L_COLON}</dt> <dd>{INTERESTS}</dd><!-- ENDIF -->
 		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}{L_COLON}</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF -->
 		<!-- BEGIN custom_fields --><dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd><!-- END custom_fields -->
diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
index 3578c29e8e..6a44ebafda 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
@@ -38,10 +38,6 @@
 		<dt><label for="location">{L_LOCATION}{L_COLON}</label></dt>
 		<dd><input type="text" name="location" id="location" maxlength="255" value="{LOCATION}" class="inputbox" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="occupation">{L_OCCUPATION}{L_COLON}</label></dt>
-		<dd><textarea name="occupation" id="occupation" class="inputbox" rows="3" cols="30">{OCCUPATION}</textarea></dd>
-	</dl>
 	<dl>
 		<dt><label for="interests">{L_INTERESTS}{L_COLON}</label></dt>
 		<dd><textarea name="interests" id="interests" class="inputbox" rows="3" cols="30">{INTERESTS}</textarea></dd>
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 06b5af3322..b9ad479246 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -156,10 +156,6 @@
 				<td><b class="genmed">{AGE}</b></td>
 			</tr>
 			<!-- ENDIF -->
-			<tr>
-				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_OCCUPATION}{L_COLON} </td>
-				<td><!-- IF OCCUPATION --><b class="genmed">{OCCUPATION}</b><!-- ENDIF --></td>
-			</tr>
 			<tr>
 				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_INTERESTS}{L_COLON} </td>
 				<td><!-- IF INTERESTS --><b class="genmed">{INTERESTS}</b><!-- ENDIF --></td>
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
index 2df41fa29e..f0f2119b9f 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
@@ -40,10 +40,6 @@
 	<td class="row1" width="35%"><b class="genmed">{L_LOCATION}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="text" name="location" size="30" maxlength="100" value="{LOCATION}" /></td>
 </tr>
-<tr>
-	<td class="row1" width="35%"><b class="genmed">{L_OCCUPATION}{L_COLON} </b></td>
-	<td class="row2"><textarea class="post" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></td>
-</tr>
 <tr>
 	<td class="row1" width="35%"><b class="genmed">{L_INTERESTS}{L_COLON} </b></td>
 	<td class="row2"><textarea class="post" name="interests" rows="3" cols="30">{INTERESTS}</textarea></td>