diff --git a/upload/admin/index.php b/upload/admin/index.php
index cbb9ff941..faf81b73f 100644
--- a/upload/admin/index.php
+++ b/upload/admin/index.php
@@ -127,7 +127,7 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' )
$row = DB()->sql_fetchrow($result);
$version = $row['mysql_version'];
- if( preg_match('/^(3\.23|4\.|5\.)/', $version) )
+ if( preg_match('/^(3\.23|4\.|5\.|10\.)/', $version) )
{
$dblist = array();
foreach($bb_cfg['db'] as $name => $row)
diff --git a/upload/includes/cron/jobs/tr_maintenance.php b/upload/includes/cron/jobs/tr_maintenance.php
index 430e3d495..0703035cd 100644
--- a/upload/includes/cron/jobs/tr_maintenance.php
+++ b/upload/includes/cron/jobs/tr_maintenance.php
@@ -2,7 +2,7 @@
if (!defined('BB_ROOT')) die(basename(__FILE__));
-if (empty($bb_cfg['seeder_last_seen_days_keep']) || empty($bb_cfg['seeder_never_seen_days_keep']))
+if ($bb_cfg['seeder_last_seen_days_keep'] == 0 || $bb_cfg['seeder_never_seen_days_keep'] == 0)
{
return;
}
diff --git a/upload/includes/datastore/build_stats.php b/upload/includes/datastore/build_stats.php
index 8e172cea1..7838866bf 100644
--- a/upload/includes/datastore/build_stats.php
+++ b/upload/includes/datastore/build_stats.php
@@ -52,7 +52,7 @@ if ($bb_cfg['gender'])
// birthday stat
if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled'])
{
- $sql = DB()->fetch_rowset("SELECT user_id, username, user_birthday, user_birthday, user_rank FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .") AND user_birthday != 0 ORDER BY user_level DESC, username");
+ $sql = DB()->fetch_rowset("SELECT user_id, username, user_birthday, user_rank FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .") AND user_birthday != 0 ORDER BY user_level DESC, username");
$this_year = bb_date(TIMENOW, 'Y', 'false');
$date_today = bb_date(TIMENOW, 'Ymd', 'false');
$date_forward = bb_date(TIMENOW + ($bb_cfg['birthday_check_day']*86400), 'Ymd', 'false');
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 5cddf6e33..6674d3608 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -2802,7 +2802,7 @@ function get_path_from_id ($id, $ext_id, $base_path, $first_div, $sec_div)
return ($base_path ? "$base_path/" : '') . ($id % $sec_div) .'/'. $id . ($ext ? ".$ext" : '');
}
-function send_pm($user_id, $subject, $message, $poster_id = false)
+function send_pm($user_id, $subject, $message, $poster_id = BOT_UID)
{
global $userdata;
diff --git a/upload/includes/ucp/torrent_userprofile.php b/upload/includes/ucp/torrent_userprofile.php
index bf1575baa..dd028bb88 100644
--- a/upload/includes/ucp/torrent_userprofile.php
+++ b/upload/includes/ucp/torrent_userprofile.php
@@ -199,7 +199,7 @@ $template->assign_vars(array(
$template->assign_vars(array('SHOW_SEARCH_DL' => false));
-if (!IS_USER || $profile_user_id == $userdata['user_id'])
+if (IS_AM || $profile_user_id == $userdata['user_id'])
{
$page_cfg['dl_links_user_id'] = $profile_user_id;
}
diff --git a/upload/includes/ucp/usercp_viewprofile.php b/upload/includes/ucp/usercp_viewprofile.php
index 33cded985..ed4130fb9 100644
--- a/upload/includes/ucp/usercp_viewprofile.php
+++ b/upload/includes/ucp/usercp_viewprofile.php
@@ -45,7 +45,7 @@ if (IS_ADMIN)
$rank_select = build_select('rank-sel', $rank_select, $user_rank);
}
-if (bf($profiledata['user_opt'], 'user_opt', 'viewemail') || IS_AM)
+if (bf($profiledata['user_opt'], 'user_opt', 'viewemail') || $profiledata['user_id'] == $userdata['user_id'] || IS_AM)
{
$email_uri = ($bb_cfg['board_email_form']) ? 'profile.php?mode=email&'. POST_USERS_URL .'='. $profiledata['user_id'] : 'mailto:'. $profiledata['user_email'];
$email = ''. $profiledata['user_email'] .'';
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 0091c18de..89d48e794 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -1657,7 +1657,6 @@ $lang['TERMS_OFF'] = 'Я не согласен с этими услови
$lang['JAVASCRIPT_ON_REGISTER'] = 'Для регистрации необходимо включить JavaScript';
$lang['REGISTERED_IN_TIME'] = "В данный момент регистрация закрыта
вы можете зарегистрироваться с 01:00 до 17:00 MSK (сейчас ". date('H:i') ." MSK)
Приносим извинения за это временное неудобство";
$lang['AUTOCOMPLETE'] = 'Сгенерировать пароль';
-$lang['AUTOCOMPLETE'] = 'Сгенерировать пароль';
$lang['YOUR_NEW_PASSWORD'] = 'Ваш пароль: ';
$lang['REGENERATE'] = 'Перегенерировать';