From d9bb2bc4e6eb6391c696ed43d98a76c91f21abe2 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 30 Oct 2017 15:57:08 -0400 Subject: [PATCH] Merge pull request #32157 from JJRcop/patch-2 Fixes webhook tagging when tree is found anywhere --- tools/WebhookProcessor/github_webhook_processor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php index da5b037237..37805aae7a 100644 --- a/tools/WebhookProcessor/github_webhook_processor.php +++ b/tools/WebhookProcessor/github_webhook_processor.php @@ -547,7 +547,7 @@ function has_tree_been_edited($payload, $tree){ } //find things in the _maps/map_files tree //e.g. diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm - return $github_diff !== FALSE && strpos($github_diff, 'diff --git a/' . $tree) !== FALSE; + return $github_diff !== FALSE && preg_match('/^diff --git a\/' . preg_quote($tree, '/') . '/m') !== FALSE; } $no_changelog = false;