summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-11-28 09:29:15 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-11-28 09:29:15 +0100
commit99d0e7e92dc1fbf3b5d6b0b635b4cc15fb14448a (patch)
tree9209d9fdada21c302189f5810c058ae1f53f2dbe
parent96b0328d39f857683b601946c2108ce5b71e5012 (diff)
parent0d98329cacc52b34d31d77eda6a0cf85fb4e534e (diff)
downloadnextcloud-server-99d0e7e92dc1fbf3b5d6b0b635b4cc15fb14448a.tar.gz
nextcloud-server-99d0e7e92dc1fbf3b5d6b0b635b4cc15fb14448a.zip
Merge pull request #12479 from rclarkson/master
Limit blacklist to php files
-rw-r--r--lib/private/installer.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/installer.php b/lib/private/installer.php
index f43969691c7..60ed06ae352 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -568,7 +568,7 @@ class OC_Installer{
// iterate the bad patterns
foreach($blacklist as $bl) {
- $cmd = 'grep -ri '.escapeshellarg($bl).' '.$folder.'';
+ $cmd = 'grep --include \\*.php -ri '.escapeshellarg($bl).' '.$folder.'';
$result = exec($cmd);
// bad pattern found
if($result<>'') {