aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_profile.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-03-22 17:30:20 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-03-22 17:30:20 +0000
commit1e2ed1bc9f8128d4d252c6761b50216d0b01998e (patch)
treea0f77cfde33df5debf9cc45a1444a8df5135f0fb /phpBB/includes/acp/acp_profile.php
parent02239880a55f38828b1f4151fc2d2a658312b98e (diff)
downloadforums-1e2ed1bc9f8128d4d252c6761b50216d0b01998e.tar
forums-1e2ed1bc9f8128d4d252c6761b50216d0b01998e.tar.gz
forums-1e2ed1bc9f8128d4d252c6761b50216d0b01998e.tar.bz2
forums-1e2ed1bc9f8128d4d252c6761b50216d0b01998e.tar.xz
forums-1e2ed1bc9f8128d4d252c6761b50216d0b01998e.zip
adjusting sql_freeresult a bit as well as our error handler (it now prints out if it is because of DEBUG_EXTRA being defined - which is not enabled within the betas/rc's and stable releases).
git-svn-id: file:///svn/phpbb/trunk@5699 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_profile.php')
-rw-r--r--phpBB/includes/acp/acp_profile.php18
1 files changed, 10 insertions, 8 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 6e19c0d09c..804bbb8792 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -99,7 +99,7 @@ class acp_profile
FROM ' . PROFILE_FIELDS_TABLE . "
WHERE field_id = $field_id";
$result = $db->sql_query($sql);
- $field_ident = $db->sql_fetchfield('field_ident', 0, $result);
+ $field_ident = (string) $db->sql_fetchfield('field_ident');
$db->sql_freeresult($result);
$db->sql_query('DELETE FROM ' . PROFILE_FIELDS_TABLE . " WHERE field_id = $field_id");
@@ -152,9 +152,9 @@ class acp_profile
$sql = 'SELECT lang_id
FROM ' . LANG_TABLE . "
- WHERE lang_iso = '{$config['default_lang']}'";
+ WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'";
$result = $db->sql_query($sql);
- $default_lang_id = (int) $db->sql_fetchfield('lang_id', 0, $result);
+ $default_lang_id = (int) $db->sql_fetchfield('lang_id');
$db->sql_freeresult($result);
if (!in_array($default_lang_id, $lang_defs['entry'][$field_id]))
@@ -171,7 +171,7 @@ class acp_profile
FROM ' . PROFILE_FIELDS_TABLE . "
WHERE field_id = $field_id";
$result = $db->sql_query($sql);
- $field_ident = $db->sql_fetchfield('field_ident', 0, $result);
+ $field_ident = (string) $db->sql_fetchfield('field_ident');
$db->sql_freeresult($result);
add_log('admin', 'LOG_PROFILE_FIELD_ACTIVATE', $field_ident);
@@ -196,7 +196,7 @@ class acp_profile
FROM ' . PROFILE_FIELDS_TABLE . "
WHERE field_id = $field_id";
$result = $db->sql_query($sql);
- $field_ident = $db->sql_fetchfield('field_ident', 0, $result);
+ $field_ident = (string) $db->sql_fetchfield('field_ident');
$db->sql_freeresult($result);
add_log('admin', 'LOG_PROFILE_FIELD_DEACTIVATE', $field_ident);
@@ -915,10 +915,12 @@ class acp_profile
if ($action == 'create')
{
- $result = $db->sql_query('SELECT MAX(field_order) as max_field_order FROM ' . PROFILE_FIELDS_TABLE);
- $new_field_order = (int) $db->sql_fetchfield('max_field_order', 0, $result);
+ $sql = 'SELECT MAX(field_order) as max_field_order
+ FROM ' . PROFILE_FIELDS_TABLE;
+ $result = $db->sql_query($sql);
+ $new_field_order = (int) $db->sql_fetchfield('max_field_order');
$db->sql_freeresult($result);
-
+
$field_ident = $cp->vars['field_ident'];
}