summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2009-05-26 10:36:36 +0200
committerAndreas Gohr <andi@splitbrain.org>2009-05-26 10:36:36 +0200
commitc5a54180eb5e4d3a599f5b2729ac7c9de98c3e45 (patch)
tree8140d59058cf7758ef350f6585134758ada39eab
parent2ab8543a2d3d581dd2b10deb07af3d390f6c2c7d (diff)
downloadrpg-c5a54180eb5e4d3a599f5b2729ac7c9de98c3e45.tar.gz
rpg-c5a54180eb5e4d3a599f5b2729ac7c9de98c3e45.tar.bz2
fix incorrect trimming in blowfish library FS#1690
Ignore-this: 3aee0c821e12117514c856741d7b78c1 darcs-hash:20090526083636-7ad00-91277dee85fb17ac88e53ddae7667db0b55162cd.gz
-rw-r--r--inc/blowfish.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/blowfish.php b/inc/blowfish.php
index 656bbe8f1..b81991b25 100644
--- a/inc/blowfish.php
+++ b/inc/blowfish.php
@@ -516,7 +516,7 @@ function PMA_blowfish_decrypt($encdata, $secret)
foreach (str_split($data, 8) as $chunk) {
$decrypt .= $pma_cipher->decryptBlock($chunk, $secret);
}
- return trim($decrypt);
+ return trim($decrypt,"\0"); // triming fixed for DokuWiki FS#1690
}
?>