[packages/dokuwiki.git] / dokuwiki-notify-respect-minor.patch

Upstream: https://github.com/dokuwiki/dokuwiki/pull/2651

--- dokuwiki-2022-07-31a/inc/common.php~	2022-09-03 20:15:22.000000000 +0300
+++ dokuwiki-2022-07-31a/inc/common.php	2023-03-30 18:03:39.419419351 +0300
@@ -1319,6 +1319,7 @@
     // decide if there is something to do, eg. whom to mail
     if ($who == 'admin') {
         if (empty($conf['notify'])) return false; //notify enabled?
+        if ($conf['useacl'] && $INPUT->server->str('REMOTE_USER') && $minor) return false; //skip minors
         $tpl = 'mailtext';
         $to  = $conf['notify'];
     } elseif ($who == 'subscribers') {
Commit	Line	Data
686c51ad ER	1	Upstream: https://github.com/dokuwiki/dokuwiki/pull/2651
	2
	3	--- dokuwiki-2022-07-31a/inc/common.php~ 2022-09-03 20:15:22.000000000 +0300
	4	+++ dokuwiki-2022-07-31a/inc/common.php 2023-03-30 18:03:39.419419351 +0300
	5	@@ -1319,6 +1319,7 @@
82008d57	6	// decide if there is something to do, eg. whom to mail
686c51ad ER	7	if ($who == 'admin') {
	8	if (empty($conf['notify'])) return false; //notify enabled?
	9	+ if ($conf['useacl'] && $INPUT->server->str('REMOTE_USER') && $minor) return false; //skip minors
f40adff2 ER	10	$tpl = 'mailtext';
f40adff2 ER	11	$to = $conf['notify'];
686c51ad	12	} elseif ($who == 'subscribers') {