# Since Jani seems to have us all on /ignore, I'm reverting

diff --git a/ChangeLog b/ChangeLog
index 8dbd5c9d18878654e0f670f9a43aa841505fdd9d..ffe1f847d686f3bc456bec24e48344b03589158d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,15 +7,6 @@
     touch silently failed when HAVE_UTIME is not defined.
     (This needs more consideration. Which platform does not support it?)
 
-2002-04-26  Jani Taskinen  <sniper@iki.fi>
-
-    * NEWS: - News entry about the change in php.ini-*
-
-
-    * php.ini-dist
-      php.ini-recommended:
-    Default setting for short_open_tag is better be Off.
-
 2002-04-26  Sascha Schumann  <sascha@schumann.cx>
 
     * ext/session/session.c: three less strlen invocations

diff --git a/NEWS b/NEWS
index 954875fd17a9440c66c19e5d344b242b7dbeb1d3..4627d8b2c4acdfc9d28e00ff310168d2da873007 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,6 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2002, Version 4.3.0
-- Changed the short_open_tag default to 'Off' in php.ini-dist and 
-  php.ini-recommended. (Jani)
 
 - Major update of domxml. New functions and better DOM compliance. (Uwe)
 - Added large OID value (2^31 to 2^32) support for pg_lo_import(),

diff --git a/php.ini-dist b/php.ini-dist
index 08a211869815186b4761cb2dcd4885712cc81d24..eb671163e83b52d10a642779118162286166b166 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -68,7 +68,7 @@
 engine = On
 
 ; Allow the <? tag.  Otherwise, only <?php and <script> tags are recognized.
-short_open_tag = Off
+short_open_tag = On
 
 ; Allow ASP-style <% %> tags.
 asp_tags = Off

diff --git a/php.ini-recommended b/php.ini-recommended
index c706f01be7af5536b0529c19f57a869b2ece2637..697dec6771d8d17a6cfa11cf82e66a7aa1171d5e 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -81,7 +81,7 @@
 engine = On
 
 ; Allow the <? tag.  Otherwise, only <?php and <script> tags are recognized.
-short_open_tag = Off
+short_open_tag = On
 
 ; Allow ASP-style <% %> tags.
 asp_tags = Off