mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00
Code Issues Releases Wiki Activity

some tiny changes...

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5967 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-05-26 15:04:27 +00:00
parent 8dc9fc089b
commit 9fca29eae3
33 changed files with 193 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_attachments.php
View File

@@ -1323,7 +1323,7 @@ class acp_attachments
{
$hostlist_tmp[] = "'" . $row['site_hostname'] . "'";
}
break;
// break;
}
while ($row = $db->sql_fetchrow($result));

2
phpBB/includes/acp/acp_forums.php
View File

@@ -966,6 +966,8 @@ class acp_forums
add_log('admin', 'LOG_FORUM_EDIT', $forum_data['forum_name']);
}
return $errors;
}
/**

16
phpBB/includes/acp/acp_jabber.php
View File

@@ -36,12 +36,13 @@ class acp_jabber
$this->tpl_name = 'acp_jabber';
$this->page_title = 'ACP_JABBER_SETTINGS';
$jab_enable = request_var('jab_enable', $config['jab_enable']);
$jab_host = request_var('jab_host', $config['jab_host']);
$jab_port = request_var('jab_port', $config['jab_port']);
$jab_username = request_var('jab_username', $config['jab_username']);
$jab_password = request_var('jab_password', $config['jab_password']);
$jab_resource = request_var('jab_resource', $config['jab_resource']);
$jab_enable = request_var('jab_enable', $config['jab_enable']);
$jab_host = request_var('jab_host', $config['jab_host']);
$jab_port = request_var('jab_port', $config['jab_port']);
$jab_username = request_var('jab_username', $config['jab_username']);
$jab_password = request_var('jab_password', $config['jab_password']);
$jab_resource = request_var('jab_resource', $config['jab_resource']);
$jab_package_size = request_var('jab_package_size', $config['jab_package_size']);
$jabber = new jabber();
$error = array();
@@ -160,7 +161,8 @@ class acp_jabber
'JAB_PORT' => $new['jab_port'],
'JAB_USERNAME' => $new['jab_username'],
'JAB_PASSWORD' => $new['jab_password'],
'JAB_RESOURCE' => $new['jab_resource'])
'JAB_RESOURCE' => $new['jab_resource'],
'JAB_PACKAGE_SIZE' => $new['jab_package_size'])
);
}
}

1
phpBB/includes/acp/acp_users.php
View File

@@ -621,6 +621,7 @@ class acp_users
{
$error[] = 'NEW_EMAIL_ERROR';
}
$error[] = 'NEW_EMAIL_ERROR';
// Which updates do we need to do?
$update_warning = ($user_row['user_warnings'] != $data['warnings']) ? true : false;