Empty commit

This commit is contained in:
Git 2014-02-19 08:00:32 +00:00
parent b4f4814eee
commit 64fdf92fa0
9 changed files with 34 additions and 27 deletions

View File

@ -24,7 +24,7 @@ abstract protected function listener_events();
protected $Listened = false;
protected $Connecting = false;
protected $Bound = false; // Did we successfully bind to the socket?
protected $State = 1; //Drones live
protected $State = 1; // Drone is live
public $Restart = 0; // Die by default
public function __construct() {

View File

@ -1,5 +1,8 @@
CHANGE LOG
2014-02-19 by alderaan
Reduce width of the main table in the Tag Aliases manager
2014-02-11 by alderaan
Re-enable torrent inactivity deletion for public Gazelle. This was accidentally put in a public release.

View File

@ -907,12 +907,12 @@ CREATE TABLE `sphinx_requests_delta` (
`UserID` int(10) unsigned NOT NULL DEFAULT '0',
`TimeAdded` int(12) unsigned DEFAULT NULL,
`LastVote` int(12) unsigned DEFAULT NULL,
`CategoryID` int(3) NOT NULL,
`CategoryID` tinyint(4) DEFAULT NULL,
`Title` varchar(255) DEFAULT NULL,
`Year` int(4) DEFAULT NULL,
`ArtistList` varchar(2048) DEFAULT NULL,
`ReleaseType` tinyint(2) DEFAULT NULL,
`CatalogueNumber` varchar(50) NOT NULL,
`CatalogueNumber` varchar(50) DEFAULT NULL,
`BitrateList` varchar(255) DEFAULT NULL,
`FormatList` varchar(255) DEFAULT NULL,
`MediaList` varchar(255) DEFAULT NULL,

View File

@ -569,8 +569,8 @@
$TimeCompare = 1267643718; // Requests v2 was implemented 2010-03-03 20:15:18
$Requests = Requests::get_requests(array_keys($SphRequests));
foreach ($SphRequests as $RequestID => $SphRequest) {
$Request = $Requests[$RequestID];
foreach ($Requests as $RequestID => $Request) {
$SphRequest = $SphRequests[$RequestID];
$Bounty = $SphRequest['bounty'] * 1024; // Sphinx stores bounty in kB
$VoteCount = $SphRequest['votes'];

View File

@ -55,6 +55,12 @@
WHERE RequestID = '$RequestID'");
$Cache->delete_value("request_artists_$RequestID");
G::$DB->query("
REPLACE INTO sphinx_requests_delta
(ID)
VALUES
($RequestID)");
if ($UserID != $LoggedUser['ID']) {
Misc::send_pm($UserID, 0, 'A request you created has been deleted', "The request \"$FullName\" was deleted by [url=https://".SSL_SITE_URL.'/user.php?id='.$LoggedUser['ID'].']'.$LoggedUser['Username'].'[/url] for the reason: '.$_POST['reason']);
}
@ -66,7 +72,6 @@
if ($GroupID) {
$Cache->delete_value("requests_group_$GroupID");
}
Requests::update_sphinx_requests($RequestID);
header('Location: requests.php');
?>

View File

@ -5,7 +5,7 @@
View::show_header('Tag Aliases');
$orderby = (($_GET['order'] == 'badtags') ? 'BadTag' : 'AliasTag');
$orderby = ($_GET['order'] === 'badtags' ? 'BadTag' : 'AliasTag');
if (check_perms('users_mod')) {
if (isset($_POST['newalias'])) {
@ -43,7 +43,7 @@
<a href="tools.php?action=tag_aliases&amp;order=badtags" class="brackets">Sort by bad tags</a>
</div>
</div>
<table width="100%">
<table class="thin">
<tr class="colhead">
<td>Proper tag</td>
<td>Renamed from</td>
@ -69,10 +69,10 @@
</form>
</tr>
<?
$DB->query('
$DB->query("
SELECT ID, BadTag, AliasTag
FROM tag_aliases
ORDER BY ' . $orderby);
ORDER BY $orderby");
while (list($ID, $BadTag, $AliasTag) = $DB -> next_record()) {
?>
<tr>

View File

@ -786,7 +786,6 @@
}
if (!empty($Summary)) {
$UpdateSet[] = "AdminComment = '$Summary'";
} else {