2006-02-01 Chris Toshok <toshok@ximian.com>

	* WebEncoding.cs: CONFIGURATION_2_0 => NET_2_0, and use GetSection
	instead of GetWebApplicationSection.

svn path=/trunk/mcs/; revision=56408

diff --git a/mcs/class/System.Web/System.Web.Util/ChangeLog b/mcs/class/System.Web/System.Web.Util/ChangeLog
index 69e966cf49538b52d6363bc4586a0f2233e47d68..394d9e2ef68da80221205e337423068c32c77a34 100644 (file)
--- a/mcs/class/System.Web/System.Web.Util/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Util/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-01  Chris Toshok  <toshok@ximian.com>
+
+       * WebEncoding.cs: CONFIGURATION_2_0 => NET_2_0, and use GetSection
+       instead of GetWebApplicationSection.
+
 2006-01-31 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * UrlUtils.cs: more than one consecutive slash are turned into one.

diff --git a/mcs/class/System.Web/System.Web.Util/WebEncoding.cs b/mcs/class/System.Web/System.Web.Util/WebEncoding.cs
index 3e6ef94d26b8fb08712d0106dac45c345165b183..cfc6a689d3804d336113341a2ca5ff3c9591b6b4 100644 (file)
--- a/mcs/class/System.Web/System.Web.Util/WebEncoding.cs
+++ b/mcs/class/System.Web/System.Web.Util/WebEncoding.cs
@@ -36,14 +36,14 @@ namespace System.Web.Util
 {
        internal class WebEncoding
        {
-#if CONFIGURATION_2_0
+#if NET_2_0
                static bool cached;
                static GlobalizationSection sect;
                static GlobalizationSection GlobalizationConfig {
                        get {
                                if (!cached) {
                                        try {
-                                               sect = (GlobalizationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/globalization");
+                                               sect = (GlobalizationSection) WebConfigurationManager.GetSection ("system.web/globalization");
                                        }
                                        catch { }
                                        cached = true;