# HG changeset patch
# User Dan Fuhry <dan@enanocms.org>
# Date 1293646959 18000
# Node ID 1649f687e69eefe2dec5621bec86d95a44676ccf
# Parent  61d87ee12e80ae7baa8faac4f086f3260389abd4
AES: Fixed wrongfully hardcoded $return_format/$input_format (non-security)

diff -r 61d87ee12e80 -r 1649f687e69e includes/rijndael.php
--- a/includes/rijndael.php	Fri Nov 19 03:30:35 2010 -0500
+++ b/includes/rijndael.php	Wed Dec 29 13:22:39 2010 -0500
@@ -1492,7 +1492,7 @@
 	
 	public function encrypt($plaintext, $key, $return_format = ENC_HEX)
 	{
-		return $this->encrypt_cbc($plaintext, $key, '00000000000000000000000000000000', ENC_HEX);
+		return $this->encrypt_cbc($plaintext, $key, '00000000000000000000000000000000', $return_format);
 	}
 	
 	/**
@@ -1506,7 +1506,7 @@
 	
 	public function decrypt($cryptext, $key, $input_format = ENC_HEX, $no_cache = false)
 	{
-		return $this->decrypt_cbc($cryptext, $key, '00000000000000000000000000000000', ENC_HEX, $no_cache);
+		return $this->decrypt_cbc($cryptext, $key, '00000000000000000000000000000000', $input_format, $no_cache);
 	}
 	
 	/**