Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Tinker with the wording of the short_open_tag description.
This commit is contained in:
Adam Harvey 2013-09-09 16:58:35 -07:00
commit d209c362d2
2 changed files with 12 additions and 14 deletions

View file

@ -197,13 +197,12 @@
engine = On engine = On
; This directive determines whether or not PHP will recognize code between ; 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 ; <? and ?> tags as PHP source which should be processed as such. It is
; recommended for several years that you not use the short tag "short cut" and ; generally recommended that <?php and ?> should be used and that this feature
; instead to use the full <?php and ?> tag combination. With the wide spread use ; should be disabled, as enabling it may result in issues when generating XML
; of XML and use of these tags by other languages, the server can become easily ; documents, however this remains supported for backward compatibility reasons.
; confused and end up parsing the wrong code in the wrong context. But because ; Note that this directive does not control the <?= shorthand tag, which can be
; this short cut has been a feature for such a long time, it's currently still ; used regardless of this directive.
; supported for backwards compatibility, but we recommend you don't use them.
; Default Value: On ; Default Value: On
; Development Value: Off ; Development Value: Off
; Production Value: Off ; Production Value: Off

View file

@ -197,13 +197,12 @@
engine = On engine = On
; This directive determines whether or not PHP will recognize code between ; 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 ; <? and ?> tags as PHP source which should be processed as such. It is
; recommended for several years that you not use the short tag "short cut" and ; generally recommended that <?php and ?> should be used and that this feature
; instead to use the full <?php and ?> tag combination. With the wide spread use ; should be disabled, as enabling it may result in issues when generating XML
; of XML and use of these tags by other languages, the server can become easily ; documents, however this remains supported for backward compatibility reasons.
; confused and end up parsing the wrong code in the wrong context. But because ; Note that this directive does not control the <?= shorthand tag, which can be
; this short cut has been a feature for such a long time, it's currently still ; used regardless of this directive.
; supported for backwards compatibility, but we recommend you don't use them.
; Default Value: On ; Default Value: On
; Development Value: Off ; Development Value: Off
; Production Value: Off ; Production Value: Off