diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-05-29 11:14:15 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-05-29 11:14:15 +0400 |
| commit | 7e00d0994f666f9ed698f86bcd88087ebabe2bfe (patch) | |
| tree | 66946b315c92bd3cac7e064bf445aac71576c52d | |
| parent | ad90e90d904842cf95684111dececce311b8ef7d (diff) | |
| parent | 8b515fa00ad844af82158449ee3d5d1c72a93451 (diff) | |
| download | php-git-7e00d0994f666f9ed698f86bcd88087ebabe2bfe.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed incorrect argument number
| -rw-r--r-- | Zend/zend_compile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 862f82da01..8674f92471 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5687,7 +5687,7 @@ void zend_do_shell_exec(znode *result, const znode *cmd TSRMLS_DC) /* {{{ */ break; } SET_NODE(opline->op1, cmd); - opline->op2.opline_num = 0; + opline->op2.opline_num = 1; opline->extended_value = ZEND_DO_FCALL; SET_UNUSED(opline->op2); |