diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2010-04-26 16:09:21 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2010-04-26 16:09:21 +0200 |
| commit | 30841679f57da9de8053c8291a665043f8f92c03 (patch) | |
| tree | c3bbd7b9a08a43eca1d3c715f5714b33ab7c6e61 | |
| parent | 78a1cf24831e067aae04531718a167e8ec144fda (diff) | |
fixed errant syntax in changeset 53ace78c4b45, fixes #37
| -rw-r--r-- | system/libraries/Form_validation.php | 6 | ||||
| -rw-r--r-- | system/libraries/Upload.php | 2 | ||||
| -rw-r--r-- | system/libraries/Xmlrpc.php | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 73cb6b853..64baaef25 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1254,11 +1254,11 @@ class CI_Form_validation { */ function xss_clean($str) { - if ( ! is_object($this->CI->security)) + if ( ! isset($this->CI->security)) { - $this->CI->load('security'); + $this->CI->load->library('security'); } - + return $this->CI->security->xss_clean($str); } diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index d7cf236f8..b3c625eb1 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -855,7 +855,7 @@ class CI_Upload { $CI =& get_instance(); - if ( ! is_object($CI->security)) + if ( ! isset($CI->security)) { $CI->load('security'); } diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index ee65398ec..ff03a503a 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -505,9 +505,9 @@ class XML_RPC_Response { $CI =& get_instance(); - if ($this->xss_clean && ! is_object($CI->security)) + if ($this->xss_clean && ! isset($CI->security)) { - $CI->load('security'); + $CI->load->library('security'); } if ($array !== FALSE && is_array($array)) @@ -1124,9 +1124,9 @@ class XML_RPC_Message extends CI_Xmlrpc { $CI =& get_instance(); - if ($this->xss_clean && ! is_object($CI->security)) + if ($this->xss_clean && ! isset($CI->security)) { - $CI->load('security'); + $CI->load->library('security'); } if ($array !== FALSE && is_array($array)) |