diff options
| author | Anatol Belski <ab@php.net> | 2014-07-11 09:38:44 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-11 09:38:44 +0200 |
| commit | e0d6ed6b21e56cd1705b761713d21c1ebb33b825 (patch) | |
| tree | 4292f92c1f8f6cf80142f03c113fa9087c816b34 /win32 | |
| parent | 63abaa6d69236c4abf06a00fbc64908e29b7ab81 (diff) | |
| parent | f3d565f6acc2ec0dbcf366b078cb4348b09d8abe (diff) | |
| download | php-git-e0d6ed6b21e56cd1705b761713d21c1ebb33b825.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixe output_as_table() when no ext was enabled
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/confutils.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index d8d0ab1e32..bb61a448e6 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1520,7 +1520,7 @@ function output_as_table(header, ar_out) var min = new Array(l);
var max = new Array(l);
- if (l != ar_out[0].length) {
+ if (!!ar_out[0] && l != ar_out[0].length) {
STDOUT.WriteLine("Invalid header argument, can't output the table " + l + " " + ar_out[0].length );
return;
}
|