cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes webhook diff selecting partial match

Browse Source 
By disabling multiline mode, $ becomes the end of the string, so we can match either \Rdiff or $, so that the lazy modifier must match the rest of the string if it can't find \Rdiff
This commit is contained in:
JJRcop
2018-01-11 14:41:54 -05:00
committed by GitHub
parent 0c473c4531
commit 7b3d27c695
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/WebhookProcessor/github_webhook_processor.php
View File

@@ -545,7 +545,7 @@ function auto_update($payload){
get_diff($payload);
$content = file_get_contents('https://raw.githubusercontent.com/' . $repoOwnerAndName . '/' . $tracked_branch . '/'. $path_to_script);
$content_diff = "### Diff not available. :slightly_frowning_face:";
if($github_diff && preg_match('/(diff --git a\/' . preg_quote($path_to_script, '/') . '.+?)(?:^diff)?/sm', $github_diff, $matches)) {
if($github_diff && preg_match('/(diff --git a\/' . preg_quote($path_to_script, '/') . '.+?)(?:\Rdiff|$)/s', $github_diff, $matches)) {
$script_diff = $matches[1];
if($script_diff) {
$content_diff = "``" . "`DIFF\n" . $script_diff ."\n``" . "`";