From 4d24681259fdd8ca5d9c1ed754db203159c979df Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 5 Jun 2014 23:28:00 +0200
Subject: [PATCH] [ticket/12666] Use "None" for images in root of gallery
 avatar path

"None" serves no real purpose right now. After this it will be used instead
of "Main" for images in the root of the gallery avatar path.

PHPBB3-12666
---
 phpBB/adm/style/acp_avatar_options_local.html               | 1 -
 phpBB/phpbb/avatar/driver/local.php                         | 6 +++---
 .../styles/prosilver/template/ucp_avatar_options_local.html | 1 -
 .../subsilver2/template/ucp_avatar_options_local.html       | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index 0cdb3644d7..8adafa1d99 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -1,7 +1,6 @@
 <dl>
 	<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
 	<dd><select name="avatar_local_cat" id="category">
-		<option value="">{L_NO_AVATAR_CATEGORY}</option>
 		<!-- BEGIN avatar_local_cats -->
 		<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
 		<!-- END avatar_local_cats -->
diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php
index c9e6781205..f3acf7cb2c 100644
--- a/phpBB/phpbb/avatar/driver/local.php
+++ b/phpBB/phpbb/avatar/driver/local.php
@@ -131,7 +131,7 @@ class local extends \phpbb\avatar\driver\driver
 		}
 
 		return array(
-			'avatar' => ($category != $user->lang['MAIN']) ? $category . '/' . $file : $file,
+			'avatar' => ($category != $user->lang['NO_AVATAR_CATEGORY']) ? $category . '/' . $file : $file,
 			'avatar_width' => $avatar_list[$category][urldecode($file)]['width'],
 			'avatar_height' => $avatar_list[$category][urldecode($file)]['height'],
 		);
@@ -179,9 +179,9 @@ class local extends \phpbb\avatar\driver\driver
 					{
 						$dims = array(0, 0);
 					}
-					$cat = ($path == $file_path) ? $user->lang['MAIN'] : str_replace("$path/", '', $file_path);
+					$cat = ($path == $file_path) ? $user->lang['NO_AVATAR_CATEGORY'] : str_replace("$path/", '', $file_path);
 					$avatar_list[$cat][$image] = array(
-						'file'      => ($cat != $user->lang['MAIN']) ? rawurlencode($cat) . '/' . rawurlencode($image) : rawurlencode($image),
+						'file'      => ($cat != $user->lang['NO_AVATAR_CATEGORY']) ? rawurlencode($cat) . '/' . rawurlencode($image) : rawurlencode($image),
 						'filename'  => rawurlencode($image),
 						'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
 						'width'     => $dims[0],
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
index 3946b9d269..2a0f403782 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -1,6 +1,5 @@
 <!-- IF .avatar_local_cats -->
 <label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="avatar_local_cat" id="category">
-<option value="">{L_NO_AVATAR_CATEGORY}</option>
 <!-- BEGIN avatar_local_cats -->
 <option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
 <!-- END avatar_local_cats -->
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
index 87e5608fec..7beddfc109 100644
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
@@ -2,7 +2,6 @@
 	<!-- IF .avatar_local_cats -->
 	<tr> 
 		<td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}{L_COLON} </span><select name="avatar_local_cat" id="category">
-			<option value="">{L_NO_AVATAR_CATEGORY}</option>
 			<!-- BEGIN avatar_local_cats -->
 			<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
 			<!-- END avatar_local_cats -->