MDL-52361 core: patch Horde library for PHP7 compatibility

This commit is contained in:
Marina Glancy 2015-12-08 12:47:15 +08:00
parent ea5c18dfce
commit 19ad1ce44c
2 changed files with 3 additions and 2 deletions

View File

@ -3245,7 +3245,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base
if (is_string($val)) {
// These entries are text fields.
$ret->$env_data[$key] = substr($val, 0, $env_str);
$ret->{$env_data[$key]} = substr($val, 0, $env_str);
} else {
// These entries are address structures.
$group = null;
@ -3287,7 +3287,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base
}
}
$ret->$env_data[$key] = $tmp;
$ret->{$env_data[$key]} = $tmp;
}
++$key;

View File

@ -8,6 +8,7 @@ Description of import of Horde libraries
# Copy the following script and store it on /tmp, change it's execute bit, and run it, passing
in your path to Horde (the directory you've cloned the repository):
/tmp/copyhorde.sh ~/git/ext/horde/
# MDL-52361 patched for PHP7 compatibility, after upgrade make sure it's updated upstream and remove this line
====
#!/bin/sh