2005-01-19 Sebastien Pouliot <[email protected]>

 
	* AspNetHostingPermission.cs: Reverted last patch as this was fixed in
	Fx 1.1 SP1 so we better have this "fixed" behaviour too.


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

mcs/class/System/System.Web/AspNetHostingPermission.cs

@@ -115,13 +115,8 @@ namespace System.Web {
 		public override IPermission Intersect (IPermission target)
 		{
 			AspNetHostingPermission anhp = Cast (target);
-			if (anhp == null) {
-#if NET_2_0
+			if (anhp == null)
 				return null;
-#else
-				return new AspNetHostingPermission (_level);
-#endif
-			}
 
 			return new AspNetHostingPermission ((_level <= anhp.Level) ? _level : anhp.Level);
 		}

mcs/class/System/System.Web/ChangeLog

@@ -1,3 +1,8 @@
+2005-01-19  Sebastien Pouliot  <[email protected]> 
+ 
+	* AspNetHostingPermission.cs: Reverted last patch as this was fixed in
+	Fx 1.1 SP1 so we better have this "fixed" behaviour too.
+
 2005-01-19  Sebastien Pouliot  <[email protected]>
 
 	* AspNetHostingPermission.cs: Fixed Intersect(null) which has a