diff options
| author | Adam Harvey <aharvey@php.net> | 2013-09-09 16:58:35 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-09-09 16:58:35 -0700 |
| commit | d209c362d2d59b0ceb82ff300cc868933ae23a06 (patch) | |
| tree | e00eb9149387fef87c079825bdb44bef70a179b2 | |
| parent | 144f2f1773c9f2ca6ce65ddc11568869aa81b038 (diff) | |
| parent | 160cd8d0a7205cacab9800318abb63a540587c4f (diff) | |
| download | php-git-d209c362d2d59b0ceb82ff300cc868933ae23a06.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Tinker with the wording of the short_open_tag description.
| -rw-r--r-- | php.ini-development | 13 | ||||
| -rw-r--r-- | php.ini-production | 13 |
2 files changed, 12 insertions, 14 deletions
diff --git a/php.ini-development b/php.ini-development index 43ab1de26a..93dc32da2e 100644 --- a/php.ini-development +++ b/php.ini-development @@ -197,13 +197,12 @@ engine = On ; This directive determines whether or not PHP will recognize code between -; <? and ?> tags as PHP source which should be processed as such. It's been -; recommended for several years that you not use the short tag "short cut" and -; instead to use the full <?php and ?> tag combination. With the wide spread use -; of XML and use of these tags by other languages, the server can become easily -; confused and end up parsing the wrong code in the wrong context. But because -; this short cut has been a feature for such a long time, it's currently still -; supported for backwards compatibility, but we recommend you don't use them. +; <? and ?> tags as PHP source which should be processed as such. It is +; generally recommended that <?php and ?> should be used and that this feature +; should be disabled, as enabling it may result in issues when generating XML +; documents, however this remains supported for backward compatibility reasons. +; Note that this directive does not control the <?= shorthand tag, which can be +; used regardless of this directive. ; Default Value: On ; Development Value: Off ; Production Value: Off diff --git a/php.ini-production b/php.ini-production index 0014c4e251..02a43790d2 100644 --- a/php.ini-production +++ b/php.ini-production @@ -197,13 +197,12 @@ engine = On ; This directive determines whether or not PHP will recognize code between -; <? and ?> tags as PHP source which should be processed as such. It's been -; recommended for several years that you not use the short tag "short cut" and -; instead to use the full <?php and ?> tag combination. With the wide spread use -; of XML and use of these tags by other languages, the server can become easily -; confused and end up parsing the wrong code in the wrong context. But because -; this short cut has been a feature for such a long time, it's currently still -; supported for backwards compatibility, but we recommend you don't use them. +; <? and ?> tags as PHP source which should be processed as such. It is +; generally recommended that <?php and ?> should be used and that this feature +; should be disabled, as enabling it may result in issues when generating XML +; documents, however this remains supported for backward compatibility reasons. +; Note that this directive does not control the <?= shorthand tag, which can be +; used regardless of this directive. ; Default Value: On ; Development Value: Off ; Production Value: Off |