From e47d02a276f2571b83df35f9ff664e919b090c1b Mon Sep 17 00:00:00 2001 From: Git Date: Wed, 12 Jun 2013 08:00:46 +0000 Subject: [PATCH] Empty commit --- classes/inbox.class.php | 7 +++++-- classes/invite_tree.class.php | 1 - classes/script_start.php | 2 -- classes/tools.class.php | 1 - classes/user_rank.class.php | 1 - classes/users.class.php | 2 -- design/privateheader.php | 6 +++--- sections/ajax/browse.php | 1 + sections/ajax/usersearch.php | 8 +++++--- sections/artist/artist.php | 8 +++++--- sections/comments/torrentcomments.php | 2 +- sections/donate/config.php | 1 - sections/donate/donate.php | 1 - sections/donate/donate_gpal.php | 1 - sections/forums/mod_thread.php | 1 - sections/forums/newthread.php | 1 - sections/forums/thread.php | 5 ++--- sections/inbox/compose.php | 2 +- sections/inbox/conversation.php | 14 +++++++------- sections/inbox/forward.php | 2 +- sections/inbox/inbox.php | 20 +++++++++++++++----- sections/inbox/massdelete_handle.php | 4 ++-- sections/inbox/takecompose.php | 2 +- sections/inbox/takeedit.php | 2 +- sections/index/feat_merch.php | 1 - sections/register/index.php | 1 - sections/reportsv2/ajax_new_report.php | 3 --- sections/reportsv2/static.php | 3 --- sections/reportsv2/views.php | 1 - sections/requests/takefill.php | 2 -- sections/schedule/index.php | 2 -- sections/stats/users.php | 2 -- sections/tools/data/economic_stats.php | 1 - sections/tools/managers/tag_aliases.php | 2 +- sections/tools/misc/render_base.html | 2 +- sections/torrents/delete.php | 2 -- sections/torrents/edit.php | 1 - sections/torrents/notify.php | 1 - sections/user/edit.php | 3 +-- sections/user/sessions.php | 1 - sections/user/takemoderate.php | 4 ---- sections/user/user.php | 1 - sections/userhistory/subscriptions.php | 1 - sections/wiki/index.php | 1 - static/functions/musicbrainz.js | 14 +++++++------- 45 files changed, 60 insertions(+), 84 deletions(-) diff --git a/classes/inbox.class.php b/classes/inbox.class.php index 9e02637c..9a005826 100644 --- a/classes/inbox.class.php +++ b/classes/inbox.class.php @@ -5,11 +5,14 @@ class Inbox { * Get the link to a user's inbox. * This is what handles the ListUnreadPMsFirst setting * - * @param boolean - the value of $LoggedUser['ListUnreadPMsFirst'] * @param string - whether the inbox or sentbox should be loaded * @return string - the URL to a user's inbox */ - public static function get_inbox_link($ListFirst = 0, $WhichBox = 'inbox') { + public static function get_inbox_link($WhichBox = 'inbox') { + global $LoggedUser; + + $ListFirst = $LoggedUser['ListUnreadPMsFirst']; + if ($WhichBox == 'inbox') { if ($ListFirst) { $InboxURL = 'inbox.php?sort=unread'; diff --git a/classes/invite_tree.class.php b/classes/invite_tree.class.php index 0f365593..3345a7f1 100644 --- a/classes/invite_tree.class.php +++ b/classes/invite_tree.class.php @@ -215,7 +215,6 @@ function make_tree() { echo '; the total amount downloaded was '.Format::get_size($TopLevelDownload); echo '; and the total ratio is '.Format::get_ratio_html($TopLevelUpload, $TopLevelDownload).'. '; - echo 'These numbers include the stats of paranoid users and will be factored into the invitation giving script.

'; if ($ParanoidCount) { diff --git a/classes/script_start.php b/classes/script_start.php index e80e6535..afcd0725 100644 --- a/classes/script_start.php +++ b/classes/script_start.php @@ -357,7 +357,6 @@ // IP changed - if ($LoggedUser['IP'] != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) { if (Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) { @@ -426,7 +425,6 @@ function logout() { setcookie('session', '', time() - 60 * 60 * 24 * 365, '/', '', false); if ($SessionID) { - $DB->query(" DELETE FROM users_sessions WHERE UserID='$LoggedUser[ID]' diff --git a/classes/tools.class.php b/classes/tools.class.php index e9d3edfa..469cd8b4 100644 --- a/classes/tools.class.php +++ b/classes/tools.class.php @@ -187,7 +187,6 @@ public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) { } $Cache->delete_value('users_sessions_'.$UserID); - $DB->query(" DELETE FROM users_sessions WHERE UserID='$UserID'"); diff --git a/classes/user_rank.class.php b/classes/user_rank.class.php index ae6c1a2e..de76e19e 100644 --- a/classes/user_rank.class.php +++ b/classes/user_rank.class.php @@ -86,7 +86,6 @@ function table_query($TableName) { ORDER BY Posts;"; break; case 'bounty': - $Query = " SELECT SUM(rv.Bounty) AS Bounty FROM users_main AS um diff --git a/classes/users.class.php b/classes/users.class.php index 8eace908..3f20236b 100644 --- a/classes/users.class.php +++ b/classes/users.class.php @@ -51,7 +51,6 @@ public static function user_info($UserID) { if (empty($UserInfo) || empty($UserInfo['ID']) || !isset($UserInfo['Paranoia']) || empty($UserInfo['Class'])) { $OldQueryID = $DB->get_query_id(); - $DB->query(" SELECT m.ID, @@ -122,7 +121,6 @@ public static function user_heavy_info($UserID) { global $DB, $Cache; $HeavyInfo = $Cache->get_value('user_info_heavy_'.$UserID); - if (empty($HeavyInfo)) { $DB->query(" diff --git a/design/privateheader.php b/design/privateheader.php index 2c5397b0..5c0e52d0 100644 --- a/design/privateheader.php +++ b/design/privateheader.php @@ -159,7 +159,7 @@ $Cache->cache_value('subscriptions_user_new_'.$LoggedUser['ID'], $NewSubscriptions, 0); } ?>