Created
November 30, 2012 19:54
-
-
Save evilchili/4178135 to your computer and use it in GitHub Desktop.
patch to fix plugins/system/scriptmerge/scriptmerge.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- scriptmerge.php.dist 2012-11-30 11:52:31.000000000 -0800 | |
| +++ scriptmerge.php 2012-11-30 11:49:07.000000000 -0800 | |
| @@ -300,7 +300,7 @@ | |
| $cacheExpireFile = $cachePath.'_expire'; | |
| // Check the cache | |
| - if(true || ScriptMergeHelper::hasExpired($cacheExpire, $cachePath)) { | |
| + if( ScriptMergeHelper::hasExpired($cacheExpireFile, $cachePath)) { | |
| $buffer = null; | |
| foreach($list as $file) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Hi,
Thanks for the gist. The line you replaced seems a development-error that was not ment to go into the live version of the plugin. We will release a new version soon to include this fix.
Regards,
Jisse