1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-12 01:50:48 +01:00

+static/unapplied patches

This commit is contained in:
Fred Brennan 2023-01-12 05:37:21 -05:00
parent 3256049ca9
commit fe3e4997b6
2 changed files with 35 additions and 0 deletions

View File

@ -13,6 +13,8 @@ Some patches remain unapplied due to their uncertain maintenance burden. You may
<li><a class="commit-link" href="https://github.com/vichan-devel/vichan/commit/5d31f3bab70de7f983fd56aa18817ede38d1d4f3"><tt>5d31f3b</tt></a> (<span class="reference"><a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="1530457642" data-permission-text="Title is private" data-url="https://github.com/vichan-devel/vichan/issues/527" data-hovercard-type="pull_request" data-hovercard-url="/vichan-devel/vichan/pull/527/hovercard" href="https://github.com/vichan-devel/vichan/pull/527">Allow open parentheses before cite: "(&gt;&gt;1"<span class="issue-shorthand">&nbsp;#527</span></a></span>) by <a class="user-mention notranslate" href="https://github.com/discomrade">@discomrade</a></li>
</ul>
They will be collected in `static/unapplied patches` upon rejection.
About
------------
vichan is a free light-weight, fast, highly configurable and user-friendly

View File

@ -0,0 +1,33 @@
From 5d31f3bab70de7f983fd56aa18817ede38d1d4f3 Mon Sep 17 00:00:00 2001
From: discomrade <83621080+discomrade@users.noreply.github.com>
Date: Thu, 12 Jan 2023 10:16:15 +0000
Subject: [PATCH] Add open parentheses to cite regex
Allows cite regex to match a post number after an opening parenthesis. "I like the comfy threads (>>1 and >>2) because they're comfy"
From https://github.com/fallenPineapple/NPFchan/commit/d78254b41db7902b9463b8d5ccfecd30265bacf9
---
inc/functions.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/inc/functions.php b/inc/functions.php
index 7cf9c5dc3..9d3fcc57e 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2086,7 +2086,7 @@ function markup(&$body, $track_cites = false, $op = false) {
$tracked_cites = array();
// Cites
- if (isset($board) && preg_match_all('/(^|\s)&gt;&gt;(\d+?)((?=[\s,.)?!])|$)/m', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
+ if (isset($board) && preg_match_all('/(^|[\s(])&gt;&gt;(\d+?)((?=[\s,.)?!])|$)/m', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
if (count($cites[0]) > $config['max_cites']) {
error($config['error']['toomanycites']);
}
@@ -2133,7 +2133,7 @@ function markup(&$body, $track_cites = false, $op = false) {
}
// Cross-board linking
- if (preg_match_all('/(^|\s)&gt;&gt;&gt;\/(' . $config['board_regex'] . 'f?)\/(\d+)?((?=[\s,.)?!])|$)/um', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
+ if (preg_match_all('/(^|[\s(])&gt;&gt;&gt;\/(' . $config['board_regex'] . 'f?)\/(\d+)?((?=[\s,.)?!])|$)/um', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
if (count($cites[0]) > $config['max_cites']) {
error($config['error']['toomanycross']);
}