From 208fc9db683c51e3bcf1f24d1e5e0200e0f32d96 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 17 Mar 2009 18:56:01 +0000 Subject: Update Kohana to r4081. This resolves ticket http://dev.kohanaphp.com/ticket/1156 1156: "Table prefix gets append to column name" All tests pass. --- kohana/libraries/Encrypt.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kohana/libraries/Encrypt.php') diff --git a/kohana/libraries/Encrypt.php b/kohana/libraries/Encrypt.php index bfa4c625..31e72438 100644 --- a/kohana/libraries/Encrypt.php +++ b/kohana/libraries/Encrypt.php @@ -96,34 +96,34 @@ class Encrypt_Core { public function encode($data) { // Set the rand type if it has not already been set - if (self::$rand === NULL) + if (Encrypt::$rand === NULL) { if (KOHANA_IS_WIN) { // Windows only supports the system random number generator - self::$rand = MCRYPT_RAND; + Encrypt::$rand = MCRYPT_RAND; } else { if (defined('MCRYPT_DEV_URANDOM')) { // Use /dev/urandom - self::$rand = MCRYPT_DEV_URANDOM; + Encrypt::$rand = MCRYPT_DEV_URANDOM; } elseif (defined('MCRYPT_DEV_RANDOM')) { // Use /dev/random - self::$rand = MCRYPT_DEV_RANDOM; + Encrypt::$rand = MCRYPT_DEV_RANDOM; } else { // Use the system random number generator - self::$rand = MCRYPT_RAND; + Encrypt::$rand = MCRYPT_RAND; } } } - if (self::$rand === MCRYPT_RAND) + if (Encrypt::$rand === MCRYPT_RAND) { // The system random number generator must always be seeded each // time it is used, or it will not produce true random results @@ -131,7 +131,7 @@ class Encrypt_Core { } // Create a random initialization vector of the proper size for the current cipher - $iv = mcrypt_create_iv($this->config['iv_size'], self::$rand); + $iv = mcrypt_create_iv($this->config['iv_size'], Encrypt::$rand); // Encrypt the data using the configured options and generated iv $data = mcrypt_encrypt($this->config['cipher'], $this->config['key'], $data, $this->config['mode'], $iv); -- cgit v1.2.3