Modified: library/trunk/lib/filter.class.php (22 => 23)

--- library/trunk/lib/filter.class.php	2006-10-13 16:53:49 UTC (rev 22)
+++ library/trunk/lib/filter.class.php	2006-10-13 16:59:41 UTC (rev 23)
@@ -7,7 +7,7 @@
  * This is released under the GPL, see license.txt for details
  *
  * @author       Elizabeth Smith <emsmith@callicore.net>
- * @copyright    Elizabeth Smith (c)20050-2006
+ * @copyright    Elizabeth Smith (c)2005-2006
  * @link         http://callicore.net
  * @license      http://www.opensource.org/licenses/gpl-license.php GPL
  * @version      $Id$
@@ -253,29 +253,19 @@
 			}
 			case(self::COOKIE):
 			{
-				if(isset(Kalfu::$obj->cookie))
-				{
-					$var = Kalfu::$obj->cookie->$name;
-				}
-				else
-				{
-					$var = $_COOKIE[$name];
-				}
+				$var = $_COOKIE[$name];
 				break;
 			}
 			case(self::SESSION):
-				if(isset(Kalfu::$obj->session))
-				{
-					$var = Kalfu::$obj->session->$name;
-				}
-				else
-				{
-					$var = $_SESSION[$name];
-				}
+			{
+				$var = $_SESSION[$name];
 				break;
+			}
 			case(self::SERVER):
+			{
 				$var = $_SERVER[strtoupper($name)];
 				break;
+			}
 			default:
 			{
 				if(isset($_GET[$name]))
@@ -314,23 +304,9 @@
 				}
 				return $set;
 			case(self::COOKIE):
-				if(isset(Kalfu::$obj->cookie))
-				{
-					return isset(Kalfu::$obj->cookie->$name);
-				}
-				else
-				{
-					return isset($_COOKIE[$name]);
-				}
+				return isset($_COOKIE[$name]);
 			case(self::SESSION):
-				if(isset(Kalfu::$obj->session))
-				{
-					return isset(Kalfu::$obj->session->$name);
-				}
-				else
-				{
-					return isset($_SESSION[$name]);
-				}
+				return isset($_SESSION[$name]);
 			case(self::SERVER):
 				return isset($_SERVER[strtoupper($name)]);
 			default: