Revert "[BUG] Image reject repost board option now also affects YT embeds"

This reverts commit b476b660073adbe827836a7e7860b0fb3a061ff0.

2 files changed, 1 insertions, 74 deletions

diff --git a/inc/functions.php b/inc/functions.php
index e576cf99..043d4de7 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2492,53 +2492,6 @@ function getPostByHashInThread($hash, $thread) {
 	return false;
 }
 
-function getPostByEmbed($embed) {
-	global $board, $config;
-	$matches = array();
-	foreach ($config['embedding'] as &$e) {
-		if (preg_match($e[0], $embed, $matches) && isset($matches[1]) && !empty($matches[1])) {
-			$embed = '%'.$matches[1].'%';
-			break;
-		}
-	}
-
-	if (!isset($embed)) return false;
-
-	$query = prepare(sprintf("SELECT `id`,`thread` FROM ``posts_%s`` WHERE `embed` LIKE :embed", $board['uri']));
-	$query->bindValue(':embed', $embed, PDO::PARAM_STR);
-	$query->execute() or error(db_error($query));
-
-	if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
-		return $post;
-	}
-
-	return false;
-}
-
-function getPostByEmbedInThread($embed, $thread) {
-	global $board, $config;
-	$matches = array();
-	foreach ($config['embedding'] as &$e) {
-		if (preg_match($e[0], $embed, $matches) && isset($matches[1]) && !empty($matches[1])) {
-			$embed = '%'.$matches[1].'%';
-			break;
-		}
-	}
-
-	if (!isset($embed)) return false;
-
-	$query = prepare(sprintf("SELECT `id`,`thread` FROM ``posts_%s`` WHERE `embed` = :embed AND ( `thread` = :thread OR `id` = :thread )", $board['uri']));
-	$query->bindValue(':embed', $embed, PDO::PARAM_STR);
-	$query->bindValue(':thread', $thread, PDO::PARAM_INT);
-	$query->execute() or error(db_error($query));
-
-	if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
-		return $post;
-	}
-
-	return false;
-}
-
 function undoImage(array $post) {
 	if (!$post['has_file'] || !isset($post['files']))
 		return;
diff --git a/post.php b/post.php
index 383154fb..aa1b8235 100644
--- a/post.php
+++ b/post.php
@@ -295,32 +295,6 @@ if (isset($_POST['delete'])) {
 		if (!isset($post['embed'])) {
 			error($config['error']['invalid_embed']);
 		}
-
-		if ($config['image_reject_repost']) {
-			if ($p = getPostByEmbed($post['embed'])) {
-				error(sprintf($config['error']['fileexists'], 
-					($post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root']) .
-					($board['dir'] . $config['dir']['res'] .
-						($p['thread'] ?
-							$p['thread'] . '.html#' . $p['id']
-						:
-							$p['id'] . '.html'
-						))
-				));
-			}
-		} else if (!$post['op'] && $config['image_reject_repost_in_thread']) {
-			if ($p = getPostByEmbedInThread($post['embed'], $post['thread'])) {
-				error(sprintf($config['error']['fileexistsinthread'], 
-					($post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root']) .
-					($board['dir'] . $config['dir']['res'] .
-						($p['thread'] ?
-							$p['thread'] . '.html#' . $p['id']
-						:
-							$p['id'] . '.html'
-						))
-				));
-			}
-		}
 	}
 	
 	if (!hasPermission($config['mod']['bypass_field_disable'], $board['uri'])) {
@@ -853,7 +827,7 @@ if (isset($_POST['delete'])) {
 				));
 			}
 		}
-	}
+		}
 	
 	// Do filters again if OCRing
 	if ($config['tesseract_ocr'] && !hasPermission($config['mod']['bypass_filters'], $board['uri'])) {