diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index 7b3abf433..a52c3cc35 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -613,7 +613,7 @@ INSERT INTO `bb_config` VALUES ('bt_show_peers', '1'); INSERT INTO `bb_config` VALUES ('bt_show_peers_mode', '1'); INSERT INTO `bb_config` VALUES ('bt_show_port_only_moder', '1'); INSERT INTO `bb_config` VALUES ('bt_tor_browse_only_reg', '0'); -INSERT INTO `bb_config` VALUES ('bt_unset_dltype_on_tor_unreg', '0'); +INSERT INTO `bb_config` VALUES ('bt_unset_dltype_on_tor_unreg', '1'); INSERT INTO `bb_config` VALUES ('config_id', '1'); INSERT INTO `bb_config` VALUES ('cron_last_check', '1211477514'); INSERT INTO `bb_config` VALUES ('default_dateformat', 'Y-m-d H:i'); diff --git a/upload/admin/admin_bt_forum_cfg.php b/upload/admin/admin_bt_forum_cfg.php index b6268a669..6992b1549 100644 --- a/upload/admin/admin_bt_forum_cfg.php +++ b/upload/admin/admin_bt_forum_cfg.php @@ -51,7 +51,7 @@ $default_cfg_bool = array( 'bt_allow_spmode_change' => 1, 'bt_del_addit_ann_urls' => 1, 'bt_set_dltype_on_tor_reg' => 1, - 'bt_unset_dltype_on_tor_unreg' => 0, + 'bt_unset_dltype_on_tor_unreg' => 1, ); $default_cfg_num = array( diff --git a/upload/admin/admin_smilies.php b/upload/admin/admin_smilies.php index 0d97d2048..bab0566d8 100644 --- a/upload/admin/admin_smilies.php +++ b/upload/admin/admin_smilies.php @@ -114,7 +114,7 @@ if( isset($_GET['import_pack']) || isset($_POST['import_pack']) ) $smile_data[$j] = str_replace('>', '>', $smile_data[$j]); $k = $smile_data[$j]; - if( $smiles[$k] == 1 ) + if( isset($smiles[$k]) ) { if( !empty($replace_existing) ) { diff --git a/upload/ajax/view_torrent.php b/upload/ajax/view_torrent.php index 9d2f3d880..b81d7b5db 100644 --- a/upload/ajax/view_torrent.php +++ b/upload/ajax/view_torrent.php @@ -134,7 +134,7 @@ class torrent $cur_files_ary[] = $this->build_file_item($name, $length); } } - natsort($cur_files_ary); + @natsort($cur_files_ary); } else { diff --git a/upload/callseed.php b/upload/callseed.php index 57fee5a4f..0e0ade503 100644 --- a/upload/callseed.php +++ b/upload/callseed.php @@ -110,7 +110,7 @@ function call_seed($topic_id, $t_info, $to_user_id) } } - $sql = "SELECT user_id FROM ". BB_BT_DLSTATUS ." WHERE topic_id = $topic_id"; + $sql = "SELECT user_id FROM ". BB_BT_DLSTATUS ." WHERE topic_id = $topic_id AND user_id != {$userdata['user_id']}"; /*$row = DB()->fetch_rowset($sql);*/ foreach(DB()->fetch_rowset($sql) as $row) { diff --git a/upload/config.php b/upload/config.php index b37c48ef7..72fea002f 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,7 +57,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do // Increase number of revision after update $bb_cfg['tp_version'] = '2.5 pre-stable'; $bb_cfg['tp_release_date'] = '28-06-2013'; -$bb_cfg['tp_release_state'] = 'R507'; +$bb_cfg['tp_release_state'] = 'R508'; // Database $charset = 'utf8'; diff --git a/upload/language/lang_russian/lang_callseed.php b/upload/language/lang_russian/lang_callseed.php index bfef86cae..19f667bc3 100644 --- a/upload/language/lang_russian/lang_callseed.php +++ b/upload/language/lang_russian/lang_callseed.php @@ -11,6 +11,6 @@ $lang['CALLSEED_MSG_MSG'] = 'Ошибка отправки сообщения'; $lang['CALLSEED_MSG_MSG_TEXT'] = 'Ошибка сохранения текста сообщения'; $lang['CALLSEED_MSG_POPUP'] = 'Ошибка работы всплывающего окна'; $lang['CALLSEED_MSG_TIME'] = 'Не удалось установить время последнего запроса'; -$lang['CALLSEED_HAVE_SEED'] = 'Раздача не нуждаются в помощи (Сидеров: %d, Личеров: %d)'; +$lang['CALLSEED_HAVE_SEED'] = 'Раздача не нуждается в помощи (Сидеров: %d, Личеров: %d)'; $lang['CALLSEED_RETURN'] = '

Вернуться в тему'; diff --git a/upload/posting.php b/upload/posting.php index a372c9c29..30bc3db05 100644 --- a/upload/posting.php +++ b/upload/posting.php @@ -318,7 +318,7 @@ if ($mode == 'newtopic' && $topic_tpl && $post_info['topic_tpl_id']) } // Notify and draft -$post_data['is_draft'] = $post_info['is_draft']; +if (!IS_GUEST && $mode != 'newtopic') $post_data['is_draft'] = $post_info['is_draft']; if ($submit || $refresh) { $notify_user = (int) !empty($_POST['notify']); diff --git a/upload/templates/default/css/main.css b/upload/templates/default/css/main.css index 7b68be511..cb987fcc7 100644 --- a/upload/templates/default/css/main.css +++ b/upload/templates/default/css/main.css @@ -1401,7 +1401,7 @@ div#autocomplete_popup div.close { font-weight: bold; width: 12px; height: 12px; - background: url("./../images/bad.gif") transparent no-repeat; + background: url("../../../images/bad.gif") transparent no-repeat; } div#autocomplete_popup input { @@ -1414,7 +1414,7 @@ div#autocomplete_popup span.regenerate { width: 16px; height: 16px; margin: 24px 0 0 8px; - background: url("./../images/pic_loading.gif") transparent no-repeat; + background: url("../../../images/pic_loading.gif") transparent no-repeat; cursor: pointer; display: inline-block; } \ No newline at end of file