Merge branch 'wip-MDL-28948-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE

This commit is contained in:
Sam Hemelryk 2011-12-20 10:42:45 +13:00
commit 4e77491aff

View file

@ -7217,7 +7217,7 @@ class emoticon_manager {
* @return string The now encrypted data
*/
function rc4encrypt($data) {
$password = 'nfgjeingjk';
$password = get_site_identifier();
return endecrypt($password, $data, '');
}
@ -7230,7 +7230,7 @@ function rc4encrypt($data) {
* @return string The now decrypted data
*/
function rc4decrypt($data) {
$password = 'nfgjeingjk';
$password = get_site_identifier();
return endecrypt($password, $data, 'de');
}