From: foobar <sniper@php.net>
Date: Tue, 8 May 2001 20:11:46 +0000 (+0000)
Subject: Fixed: http://www.php.net/bugs.php?id=10733&edit=1
X-Git-Tag: php-4.0.6RC1~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=128df6ead78b5d51ef848a15f783ad00279ce372;p=php

Fixed: http://www.php.net/bugs.php?id=10733&edit=1
---

diff --git a/configure.in b/configure.in
index a63e856929..0de6901fa5 100644
--- a/configure.in
+++ b/configure.in
@@ -589,9 +589,9 @@ PHP_ARG_ENABLE(short-tags,whether to enable short tags by default,
 [  --disable-short-tags    Disable the short-form <? start tag by default.],yes)
 
 if test "$PHP_SHORT_TAGS" = "yes"; then
-  AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,1,[ ])
+  AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,"1",[ ])
 else
-  AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,0,[ ])
+  AC_DEFINE(DEFAULT_SHORT_OPEN_TAG,"0",[ ])
 fi
 
 
diff --git a/main/main.c b/main/main.c
index cbc8c38ad9..c6828c806d 100644
--- a/main/main.c
+++ b/main/main.c
@@ -155,7 +155,6 @@ static PHP_INI_MH(OnUpdateTimeout)
 
 
 /* Need to convert to strings and make use of:
- * DEFAULT_SHORT_OPEN_TAG
  * PHP_SAFE_MODE
  *
  * Need to be read from the environment (?):
@@ -202,7 +201,7 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_BOOLEAN("register_argc_argv",	"1",		PHP_INI_ALL,		OnUpdateBool,			register_argc_argv,		php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("register_globals",		"1",		PHP_INI_ALL,		OnUpdateBool,			register_globals,		php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("safe_mode",			"0",		PHP_INI_SYSTEM,		OnUpdateBool,			safe_mode,				php_core_globals,	core_globals)
-	STD_PHP_INI_BOOLEAN("short_open_tag",		"1",		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateBool,			short_tags,				zend_compiler_globals,	compiler_globals)
+	STD_PHP_INI_BOOLEAN("short_open_tag",DEFAULT_SHORT_OPEN_TAG,	PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateBool,			short_tags,				zend_compiler_globals,	compiler_globals)
 	STD_PHP_INI_BOOLEAN("sql.safe_mode",		"0",		PHP_INI_SYSTEM,		OnUpdateBool,			sql_safe_mode,			php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("track_errors",			"0",		PHP_INI_ALL,		OnUpdateBool,			track_errors,			php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("y2k_compliance",		"0",		PHP_INI_ALL,		OnUpdateBool,			y2k_compliance,			php_core_globals,	core_globals)