WebSVN – oidplus – Path Comparison – /

Regard whitespace Rev 669 → Rev 670

/trunk/.gitignore
12,6 → 12,7
oidplus_version.txt
.version.php
update.tmp.php
update_*.tmp.php

# Recommendation in https://phpstan.org/config-reference
# "The usual practice is to have phpstan.neon.dist under version control,

 /trunk/TODO
 ,6 → 64,9
 - XML import: If output (errors) is too long, show them in a page rather than an alert() box
 SMALL THINGS
+- cron.sh: set a global flag that tells the plugins whether we are calling from crontab,
+  so that auto publishing et al prefer cron calls and only execute their code
+  for random visitors, if the crontab is not running.
 - Login page etc.: If user clicks on a tab, then the gotoedit and static link should change to e.g. "oidplus:login$admin" or "oidplus:login$ra", respectively.
         $('#static_link').attr("href", "index.php?goto="+encodeURIComponent(id));
         $("#gotoedit").val(id);

 /trunk/includes/functions.inc.php
 ,13 → 263,13
         // Try to find out the SVN version using the shell
         // We don't prioritize this method, because a failed shell access will flood the apache error log with STDERR messages
-        $output = @shell_exec('svnversion '.escapeshellarg($dir));
+        $output = @shell_exec('svnversion '.escapeshellarg($dir).' 2>&1');
         $match = array();
         if (preg_match('/\d+/', $output, $match)) {
                 return ($cachedVersion = $match[0]);
         }
-        $output = @shell_exec('svn info '.escapeshellarg($dir));
+        $output = @shell_exec('svn info '.escapeshellarg($dir).' 2>&1');
         if (preg_match('/Revision:\s*(\d+)/m', $output, $match)) { // do not translate
                 return ($cachedVersion = $match[1]);
         }