MDL-67034 horde: php74 fix (curly braces) for the Horde lib

moodle · Nov 16, 2019 · 6b83451 · 6b83451
1 parent d547735
commit 6b83451
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/horde/framework/Horde/Crypt/Blowfish/Php/Base.php b/lib/horde/framework/Horde/Crypt/Blowfish/Php/Base.php
@@ -328,7 +328,7 @@ public function __construct($key)
         for ($i = 0; $i < 18; ++$i) {
             $data = 0;
             for ($j = 4; $j > 0; --$j) {
-                $data = $data << 8 | ord($key{$k});
+                $data = $data << 8 | ord($key[$k]);
                 $k = ($k + 1) % $len;
             }
             $this->_P[$i] ^= $data;

diff --git a/lib/horde/readme_moodle.txt b/lib/horde/readme_moodle.txt
@@ -15,6 +15,7 @@ Description of import of Horde libraries
 # Verify that these patches have been applied in the imported version. Apply them locally if not:
     - https://github.com/horde/Mail/pull/1 (Mail component).
     - https://github.com/horde/Imap_Client/pull/6 (IMAP Client component).
+    - https://github.com/horde/Crypt_Blowfish/pull/1 (PHP 7.4 compatibility, Crypt_Blowfish)
 
 ====
 #!/bin/sh
@@ -38,4 +39,4 @@ do
   then
     cp -Rf $locale/* $target/locale
   fi
-done
+done