projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #757 from mlintner/master
[mono.git]
/
mcs
/
class
/
System.Web
/
System.Web.UI.WebControls
/
SessionParameter.cs
diff --git
a/mcs/class/System.Web/System.Web.UI.WebControls/SessionParameter.cs
b/mcs/class/System.Web/System.Web.UI.WebControls/SessionParameter.cs
index e56bfe1891f13ecea58219c52e99ff2df02414bb..e90afda34ee92084bf41790ee14a80ea3d236d78 100644
(file)
--- a/
mcs/class/System.Web/System.Web.UI.WebControls/SessionParameter.cs
+++ b/
mcs/class/System.Web/System.Web.UI.WebControls/SessionParameter.cs
@@
-28,9
+28,9
@@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System.Collections;
using System.Collections.Specialized;
using System.Collections;
using System.Collections.Specialized;
+using System.Data;
using System.Text;
using System.ComponentModel;
using System.Text;
using System.ComponentModel;
@@
-57,15
+57,20
@@
namespace System.Web.UI.WebControls {
{
SessionField = sessionField;
}
{
SessionField = sessionField;
}
+
+ public SessionParameter (string name, DbType dbType, string sessionField) : base (name, dbType)
+ {
+ SessionField = sessionField;
+ }
protected override Parameter Clone ()
{
return new SessionParameter (this);
}
protected override Parameter Clone ()
{
return new SessionParameter (this);
}
-
-
protected
override object Evaluate (HttpContext ctx, Control control)
+ protected internal
+ override object Evaluate (HttpContext ctx, Control control)
{
{
- if (c
ontrol
== null || ctx.Session == null)
+ if (c
tx
== null || ctx.Session == null)
return null;
return ctx.Session [SessionField];
return null;
return ctx.Session [SessionField];
@@
-90,5
+95,5
@@
namespace System.Web.UI.WebControls {
}
}
}
}
}
}
-#endif
+