Merge pull request #83 from tiagohillebrandt/master

Daniel Bachhuber · Daniel Bachhuber · commit 037a010441a5 · 2015-08-10T05:46:19.000-07:00
Verifies if exec is not in disable_functions directive
diff --git a/lib/cli/Shell.php b/lib/cli/Shell.php
@@ -37,7 +37,7 @@ static public function columns() {
 						break;
 					}
 				}
-			} else {
+			} else if (!preg_match('/(^|,)(\s*)?exec(\s*)?(,|$)/', ini_get('disable_functions'))) {
 				$columns = (int) exec('/usr/bin/env tput cols');
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ static public function columns() {`
`37`	`37`	`break;`
`38`	`38`	`}`
`39`	`39`	`}`
`40`		`- } else {`
	`40`	`+ } else if (!preg_match('/(^\|,)(\s)?exec(\s)?(,\|$)/', ini_get('disable_functions'))) {`
`41`	`41`	`$columns = (int) exec('/usr/bin/env tput cols');`
`42`	`42`	`}`
`43`	`43`