aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_profile.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-07-10 15:55:10 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-07-10 15:55:10 +0000
commit4f7c52e9e385041320179dcb7d27a9217a353c71 (patch)
treebcab21e9174983a19f2c6256b36435ffb56ad080 /phpBB/includes/acp/acp_profile.php
parent0fa9103a0cacbe91404c32cddf0bcfe029423d04 (diff)
downloadforums-4f7c52e9e385041320179dcb7d27a9217a353c71.tar
forums-4f7c52e9e385041320179dcb7d27a9217a353c71.tar.gz
forums-4f7c52e9e385041320179dcb7d27a9217a353c71.tar.bz2
forums-4f7c52e9e385041320179dcb7d27a9217a353c71.tar.xz
forums-4f7c52e9e385041320179dcb7d27a9217a353c71.zip
fix some bugs... again. :)
git-svn-id: file:///svn/phpbb/trunk@6165 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_profile.php')
-rw-r--r--phpBB/includes/acp/acp_profile.php19
1 files changed, 12 insertions, 7 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index f2adb7b53d..28f547189d 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -50,7 +50,8 @@ class acp_profile
$lang_defs = array();
$sql = 'SELECT lang_id, lang_iso
- FROM ' . LANG_TABLE;
+ FROM ' . LANG_TABLE . '
+ ORDER BY lang_english_name';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
@@ -63,7 +64,7 @@ class acp_profile
$sql = 'SELECT field_id, lang_id
FROM ' . PROFILE_LANG_TABLE . '
- ORDER BY lang_id';
+ ORDER BY lang_id';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
@@ -293,10 +294,11 @@ class acp_profile
$field_type = $field_row['field_type'];
// Get language entries
- $sql = 'SELECT * FROM ' . PROFILE_FIELDS_LANG_TABLE . '
+ $sql = 'SELECT *
+ FROM ' . PROFILE_FIELDS_LANG_TABLE . '
WHERE lang_id = ' . $lang_defs['iso'][$config['default_lang']] . "
AND field_id = $field_id
- ORDER BY option_id ASC";
+ ORDER BY option_id ASC";
$result = $db->sql_query($sql);
$lang_options = array();
@@ -474,7 +476,8 @@ class acp_profile
if ($action == 'edit')
{
// Get language entries
- $sql = 'SELECT * FROM ' . PROFILE_FIELDS_LANG_TABLE . '
+ $sql = 'SELECT *
+ FROM ' . PROFILE_FIELDS_LANG_TABLE . '
WHERE lang_id <> ' . $lang_defs['iso'][$config['default_lang']] . "
AND field_id = $field_id
ORDER BY option_id ASC";
@@ -488,7 +491,8 @@ class acp_profile
$db->sql_freeresult($result);
- $sql = 'SELECT lang_id, lang_name, lang_explain, lang_default_value FROM ' . PROFILE_LANG_TABLE . '
+ $sql = 'SELECT lang_id, lang_name, lang_explain, lang_default_value
+ FROM ' . PROFILE_LANG_TABLE . '
WHERE lang_id <> ' . $lang_defs['iso'][$config['default_lang']] . "
AND field_id = $field_id
ORDER BY lang_id ASC";
@@ -769,7 +773,8 @@ class acp_profile
$sql = 'SELECT lang_id, lang_iso
FROM ' . LANG_TABLE . "
- WHERE lang_iso <> '" . $config['default_lang'] . "'";
+ WHERE lang_iso <> '" . $config['default_lang'] . "'
+ ORDER BY lang_english_name";
$result = $db->sql_query($sql);
$languages = array();