Skip to content

Commit fd01dd8

Browse files
edannenbergFlyingmana
authored andcommitted
Fix 1.9.4.0 merge issues (#602)
* lib/mcrypt_compat/ should be lib/mcryptcompat/ * add missing lib/phpseclib/PHP/ folder refs: #580
1 parent 4285a49 commit fd01dd8

File tree

5 files changed

+167
-1342
lines changed

5 files changed

+167
-1342
lines changed

app/Mage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
Varien_Autoload::register();
4848

4949
include_once "phpseclib/bootstrap.php";
50-
include_once "mcrypt_compat/mcrypt.php";
50+
include_once "mcryptcompat/mcrypt.php";
5151

5252
/* Support additional includes, such as composer's vendor/autoload.php files */
5353
foreach (glob(BP . DS . 'app' . DS . 'etc' . DS . 'includes' . DS . '*.php') as $path) {

0 commit comments

Comments
 (0)