mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/System.Web/System.Web.UI/TemplateParser.cs
View File

@ -955,11 +955,9 @@ namespace System.Web.UI {
internal Type PageParserFilterType {
get {
if (pageParserFilterType == null) {
#if NET_4_0
pageParserFilterType = PageParser.DefaultPageParserFilterType;
if (pageParserFilterType != null)
return pageParserFilterType;
#endif
string typeName = PagesConfig.PageParserFilterType;
if (String.IsNullOrEmpty (typeName))
return null;
@ -970,11 +968,7 @@ namespace System.Web.UI {
return pageParserFilterType;
}
}
#if NET_4_0
internal virtual
#else
internal
#endif
Type DefaultBaseType {
get {
Type type = Type.GetType (DefaultBaseTypeName, true);