Skip to content
Browse files

fixes to setOptions() and constructor

  • Loading branch information...
1 parent 4347f06 commit b5b5950736de9ff18b0c16282f8a5d6aa50e21bd @kaviththiranga committed Jul 30, 2012
Showing with 18 additions and 3 deletions.
  1. +16 −1 libraries/joomla/media/combiner.php
  2. +2 −2 libraries/joomla/media/compressor.php
View
17 libraries/joomla/media/combiner.php
@@ -42,7 +42,22 @@
public function __construct($options = array())
{
// Merge user defined options with default options
- $this->_options = array_merge($options, $this->_options);
+ $this->_options = array_merge($this->_options, $options);
+ }
+
+ /**
+ * Method to set combiner options.
+ *
+ * @param Array $options options to combiner.
+ *
+ * @return void
+ *
+ * @since 12.1
+ */
+ public function setOptions($options)
+ {
+ // Merge user defined options with default options
+ $this->_options = array_merge($this->_options, $options);
}
/**
View
4 libraries/joomla/media/compressor.php
@@ -120,7 +120,7 @@ public function getCompressed()
public function setOptions($options)
{
// Merge user defined options with default options
- $this->_options = array_merge($options, $this->_options);
+ $this->_options = array_merge($this->_options, $options);
}
/**
@@ -133,7 +133,7 @@ public function setOptions($options)
public function __construct($options = array())
{
// Merge user defined options with default options
- $this->_options = array_merge($options, $this->_options);
+ $this->_options = array_merge($this->_options, $options);
}
/**

0 comments on commit b5b5950

Please sign in to comment.
Something went wrong with that request. Please try again.