Permalink
Browse files

Merge branch 'master' of github.com:joomla/joomla-cms

  • Loading branch information...
2 parents 371d416 + bbcb656 commit 383207c97fc5fb285f1a31b7288207deeeee0084 @chdemko chdemko committed Apr 9, 2012
Showing with 26 additions and 0 deletions.
  1. +26 −0 libraries/joomla/application/input/files.php
@@ -23,6 +23,32 @@ class JInputFiles extends JInput
protected $decodedData = array();
/**
+ * Constructor.
+ *
+ * @param array $source Ignored.
+ * @param array $options Array of configuration parameters (Optional)
+ *
+ * @since 12.1
+ */
+ public function __construct(array $source = null, array $options = array())
+ {
+ if (isset($options['filter']))
+ {
+ $this->filter = $options['filter'];
+ }
+ else
+ {
+ $this->filter = JFilterInput::getInstance();
+ }
+
+ // Set the data source.
+ $this->data = & $_FILES;
+
+ // Set the options for the class.
+ $this->options = $options;
+ }
+
+ /**
* Gets a value from the input data.
*
* @param string $name Name of the value to get.

0 comments on commit 383207c

Please sign in to comment.