Permalink
Browse files

fixes to combiners

  • Loading branch information...
1 parent 7100c75 commit dc14d7bc9b4572b88c85c3e269b88c908ad2e0d1 @kaviththiranga committed Jul 31, 2012
Showing with 6 additions and 6 deletions.
  1. +5 −5 libraries/joomla/media/combiner.php
  2. +1 −1 libraries/joomla/media/combiner/js.php
@@ -53,9 +53,9 @@ public function __construct($options = array())
* @return void
*
* @since 12.1
- */
- public function setOptions($options)
- {
+ */
+ public function setOptions($options)
+ {
// Merge user defined options with default options
$this->_options = array_merge($this->_options, $options);
}
@@ -177,10 +177,10 @@ public static function getInstance( $options = array())
if (empty(self::$instances[$signature]))
{
// Derive the class name from the type.
- $class = 'JMediaCompressor' . ucfirst(strtolower($options['type']));
+ $class = 'JMediaCombiner' . ucfirst(strtolower($options['type']));
// Load the class
- jimport('joomla.media.compressor.' . $class);
+ jimport('joomla.media.combiner.' . $class);
// If the class still doesn't exist we have nothing left to do but throw an exception. We did our best.
if (!class_exists($class))
@@ -16,7 +16,7 @@
* @subpackage Compress
* @since 12.1
*/
-class JMediaCombinerJs
+class JMediaCombinerJs extends JMediaCombiner
{
public function __construct($options = array())

0 comments on commit dc14d7b

Please sign in to comment.