Empty commit

WhatCD · Feb 5, 2016 · 933eb28 · 933eb28
1 parent 85fad93
commit 933eb28
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
@@ -1,5 +1,8 @@
 CHANGE LOG
 
+2016-02-04 by newman
+Fix regex in reports.js to not remove the last character of each line except the last. Redirect to log.php when attempting to report a deleted torrent
+
 2016-01-31 by newman
 Allow locked accounts to send staff PMs to staff only
 

diff --git a/sections/reportsv2/report.php b/sections/reportsv2/report.php
@@ -19,6 +19,11 @@
 			LEFT JOIN torrents AS t ON t.GroupID = tg.ID
 		WHERE t.ID = " . $_GET['id']);
 	list($CategoryID, $GroupID) = $DB->next_record();
+	if (empty($CategoryID) || empty($GroupID)) {
+		// Deleted torrent
+		header("Location: log.php?search=Torrent+" . $TorrentID);
+		die();
+	}
 	$Artists = Artists::get_artist($GroupID);
 	$TorrentCache = get_group_info($GroupID, true, $RevisionID);
 	$GroupDetails = $TorrentCache[0];

diff --git a/static/functions/reports.js b/static/functions/reports.js
@@ -10,7 +10,7 @@ function toggleNotes(id) {
 
 function saveNotes(id) {
 	var notes = $('#notes_' + id).raw().value;
-	notes = notes.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '<br />');
+	notes = notes.replace(/(\r\n|\n\r|\r|\n)/g, '<br />');
 	var post = new Array();
 	post['id'] = id;
 	post['notes'] = notes;