From: <jon...@us...> - 2010-02-16 17:41:34
|
Revision: 25272 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=25272&view=rev Author: jonnybradley Date: 2010-02-16 17:41:28 +0000 (Tue, 16 Feb 2010) Log Message: ----------- [FIX] Make minify functions multi-tiki aware Modified Paths: -------------- trunk/lib/ajax/ajaxlib.php trunk/lib/headerlib.php Modified: trunk/lib/ajax/ajaxlib.php =================================================================== --- trunk/lib/ajax/ajaxlib.php 2010-02-16 17:40:19 UTC (rev 25271) +++ trunk/lib/ajax/ajaxlib.php 2010-02-16 17:41:28 UTC (rev 25272) @@ -289,8 +289,9 @@ $headerlib->add_js("tikitabs($tab,$max_tikitabs);"); } // collect js from headerlib - $jscontent = $headerlib->output_js(false); - $tmp_jsfile = 'temp/public/'.md5($jscontent).'.js'; + $jscontent = $headerlib->output_js(false); + global $tikidomainslash; + $tmp_jsfile = 'temp/public/'.$tikidomainslash.md5($jscontent).'.js'; if ( ! file_exists( $tmp_jsfile) ) { file_put_contents( $tmp_jsfile, $jscontent ); } Modified: trunk/lib/headerlib.php =================================================================== --- trunk/lib/headerlib.php 2010-02-16 17:40:19 UTC (rev 25271) +++ trunk/lib/headerlib.php 2010-02-16 17:41:28 UTC (rev 25272) @@ -222,8 +222,9 @@ } public function getMinifiedJs() { + global $tikidomainslash; $hash = md5( serialize( $this->jsfiles ) ); - $file = "temp/public/minified_$hash.js"; + $file = 'temp/public/'.$tikidomainslash.'minified_$hash.js'; if( ! file_exists( $file ) ) { $complete = $this->getJavascript(); @@ -390,8 +391,9 @@ } private function get_minified_css( $files ) { + global $tikidomainslash; $out = array(); - $target = "temp/public/"; + $target = 'temp/public/'.$tikidomainslash; foreach( $files as $file ) { $hash = md5( $file ); @@ -408,8 +410,9 @@ } private function get_minified_css_single( $files ) { + global $tikidomainslash; $hash = md5( serialize( $files ) ); - $target = "temp/public/"; + $target = 'temp/public/'.$tikidomainslash; $file = $target . "minified_$hash.css"; if( ! file_exists( $file ) ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |