From: Antony Dovgal <tony2001@php.net>
Date: Fri, 21 Mar 2008 16:39:11 +0000 (+0000)
Subject: MFH: revert
X-Git-Tag: BEFORE_NEW_PARAMETER_PARSE~501
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f02e564f76dee7ae4a4360a854eeb5150da30d7;p=php

MFH: revert
---

diff --git a/main/main.c b/main/main.c
index e6f93d5b13..03a400d4be 100644
--- a/main/main.c
+++ b/main/main.c
@@ -406,7 +406,7 @@ PHP_INI_BEGIN()
 #endif
 	STD_PHP_INI_ENTRY("safe_mode_include_dir",	NULL,		PHP_INI_SYSTEM,		OnUpdateString,			safe_mode_include_dir,	php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("safe_mode_gid",		"0",		PHP_INI_SYSTEM,		OnUpdateBool,			safe_mode_gid,			php_core_globals,	core_globals)
-	STD_PHP_INI_BOOLEAN("short_open_tag",	DEFAULT_SHORT_OPEN_TAG,	PHP_INI_ALL,		OnUpdateBool,			short_tags,				zend_compiler_globals,	compiler_globals)
+	STD_PHP_INI_BOOLEAN("short_open_tag",	DEFAULT_SHORT_OPEN_TAG,	PHP_INI_ALL|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",		"1",		PHP_INI_ALL,		OnUpdateBool,			y2k_compliance,			php_core_globals,	core_globals)