From 885ef6321929c7c3820835c24b91cef45ba7fdc6 Mon Sep 17 00:00:00 2001 From: Git Date: Thu, 24 Jan 2013 08:00:24 +0000 Subject: [PATCH] Empty commit --- classes/class_sphinxql.php | 4 +-- classes/class_users.php | 3 ++ classes/class_votes.php | 5 ++- sections/artist/artist.php | 22 ++++++------- sections/artist/artist_rearrange.php | 4 +-- sections/bookmarks/torrents.php | 12 +++---- sections/collages/browse.php | 24 +++++++------- sections/collages/collage.php | 20 ++++++------ sections/comments/torrentcomments.php | 2 +- sections/forums/forum.php | 10 +++--- sections/forums/thread.php | 6 ++-- sections/inbox/inbox.php | 4 +-- sections/requests/requests.php | 16 ++++----- sections/schedule/index.php | 5 ++- sections/staffpm/takepost.php | 1 + sections/staffpm/user_inbox.php | 2 +- sections/top10/history.php | 10 +++--- sections/top10/torrents.php | 10 +++--- sections/torrents/browse.php | 2 +- sections/torrents/browse2.php | 4 +-- sections/torrents/details.php | 38 +++++++++++----------- sections/torrents/notify.php | 15 +++++---- sections/user/invite.php | 2 +- sections/user/takemoderate.php | 36 +++++++------------- sections/userhistory/subscriptions.php | 12 +++---- sections/wiki/article.php | 10 +++--- static/functions/subscriptions.js | 4 +-- static/styles/anorex/style.css | 10 ++++++ static/styles/celebrate/celebratetheme.css | 10 +++++- static/styles/dark_ambient/style.css | 10 ++++++ static/styles/global.css | 8 +++++ static/styles/gtfo_spaceship/style.css | 8 +++++ static/styles/hydro/style.css | 8 +++++ static/styles/kuro/style.css | 10 ++++++ static/styles/layer_cake/style.css | 16 +++++++-- static/styles/layer_cake/style2.css | 12 +++++++ static/styles/minimal/style.css | 10 ++++++ static/styles/minimal/style2.css | 10 ++++++ static/styles/minimal_mod_alt.css | 10 ++++++ static/styles/mono/style.css | 18 +++++----- static/styles/musicbrainz.css | 7 ++++ static/styles/postmod/style.css | 10 ++++++ static/styles/proton/style.css | 10 ++++++ static/styles/public/style.css | 8 +++++ static/styles/shiro/style.css | 8 +++++ static/styles/whatlove/style.css | 8 +++++ static/styles/white.cd/old_minified.css | 9 +++++ static/styles/white.cd/style.css | 9 +++++ 48 files changed, 334 insertions(+), 158 deletions(-) diff --git a/classes/class_sphinxql.php b/classes/class_sphinxql.php index 74c296da..d27c6be7 100644 --- a/classes/class_sphinxql.php +++ b/classes/class_sphinxql.php @@ -270,7 +270,7 @@ public function where_match($Expr, $Field = '*', $Escape = true) { * @param string $Mode sort method to apply to the selected attribute * @return current SphinxQL query object */ - public function order_by($Attribute = false, $Mode) { + public function order_by($Attribute = false, $Mode = false) { if (empty($Attribute)) { $this->SortBy = array(); } else { @@ -303,7 +303,7 @@ public function group_by($Attribute = false) { * @param string $Mode sort method to apply to the selected attribute * @return current SphinxQL query object */ - public function order_group_by($Attribute = false, $Mode) { + public function order_group_by($Attribute = false, $Mode = false) { if (empty($Attribute)) { $this->SortGroupBy = ''; } else { diff --git a/classes/class_users.php b/classes/class_users.php index 93163e0b..f7834f50 100644 --- a/classes/class_users.php +++ b/classes/class_users.php @@ -202,6 +202,9 @@ public static function user_heavy_info($UserID) { } else { $HeavyInfo['CustomForums'] = null; } + if (isset($HeavyInfo['CustomForums'][''])) { + unset($HeavyInfo['CustomForums']['']); + } $HeavyInfo['SiteOptions'] = unserialize($HeavyInfo['SiteOptions']); if (!empty($HeavyInfo['SiteOptions'])) { diff --git a/classes/class_votes.php b/classes/class_votes.php index ef4e53c5..bc270b2e 100644 --- a/classes/class_votes.php +++ b/classes/class_votes.php @@ -9,14 +9,13 @@ class Votes { public static function vote_link($GroupID, $Vote = '') { global $LoggedUser; if (!$LoggedUser['NoVoteLinks'] && check_perms('site_album_votes')) { ?> - - ( Vote: + + Vote: ↑ ↑ ↓ ↓ x - ) (Revision #) [Vanity House]
- [Add request] + Add request - [Notify of new uploads] + Notify of new uploads - [Do not notify of new uploads] + Do not notify of new uploads - [Remove bookmark] + Remove bookmark - [Bookmark] + Bookmark - [Edit] + Edit - [View history] - [Info] + View history + Info - [Concerts] + Concerts - [Comments] + Comments - [Delete] + Delete - [Remove bookmark] + [Remove bookmark] - [Bookmark] + [Bookmark]

RSS feed 

- [Torrents] - [Artists] - [Collages] - [Requests] + Torrents + Artists + Collages + Requests 0) { ?>

- [Remove Snatched] - [Manage Torrents] + Remove Snatched + Manage Torrents
diff --git a/sections/collages/browse.php b/sections/collages/browse.php index 1d076ebc..c96ab594 100644 --- a/sections/collages/browse.php +++ b/sections/collages/browse.php @@ -221,7 +221,7 @@
- [New collage] + New collage next_record(); ?> - [Personal collage] + Personal collage 1) { ?> - [Personal collages] + Personal collages - [Subscribed collages] + Subscribed collages - [Bookmarked collages] + Bookmarked collages - [Recover collage] + Recover collage - [Collages you started] - [Collages you contributed to] + Collages you started + Collages you contributed to - [Torrents] - [Artists] - [Collages] - [Requests] + Torrents + Artists + Collages + Requests

- [List of collages] + List of collages - [New collage] + New collage

- [] + - [Edit description] + Edit description - [Locked] + Locked - [Remove bookmark] + Remove bookmark - [Bookmark] + Bookmark - [Manage torrents] + Manage torrents - [Report collage] + Report collage - [Delete] + Delete
diff --git a/sections/comments/torrentcomments.php b/sections/comments/torrentcomments.php index 51008903..94576f31 100644 --- a/sections/comments/torrentcomments.php +++ b/sections/comments/torrentcomments.php @@ -24,7 +24,7 @@ $Conditions = "WHERE tc.AuthorID = $UserID"; $Title = 'Comments made by '.($Self?'you':$Username); $Header = 'Torrent comments left by '.($Self?'you':Users::format_username($UserID, false, false, false)).''; - if($Self) $OtherLink = 'Display comments left on your uploads'; + if($Self) $OtherLink = 'Display comments left on your uploads'; } $Comments = $DB->query("SELECT diff --git a/sections/forums/forum.php b/sections/forums/forum.php index 56e7164d..75f42ad9 100644 --- a/sections/forums/forum.php +++ b/sections/forums/forum.php @@ -70,9 +70,9 @@

Forums >

- [New Thread] + New thread - [Search this Forum] + Search this forum @@ -251,6 +251,6 @@
-
[Catch up]
+
Catch up
diff --git a/sections/forums/thread.php b/sections/forums/thread.php index 81044e9e..066985d8 100644 --- a/sections/forums/thread.php +++ b/sections/forums/thread.php @@ -164,9 +164,9 @@
- [Report Thread] - [] - [Search this Thread] + Report Thread + + Search this Thread