From 9b27ffa042d5a84d64283ea4a2e3bb8012f92c44 Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Sun, 13 May 2012 15:33:02 +0800
Subject: [PATCH] MDL-29857 - portfolio: Fix E_STRICT errors

---
 lib/portfolio/forms.php | 6 +++---
 portfolio/add.php       | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/portfolio/forms.php b/lib/portfolio/forms.php
index ba408f78486..7b7c66908ed 100644
--- a/lib/portfolio/forms.php
+++ b/lib/portfolio/forms.php
@@ -107,7 +107,7 @@ final class portfolio_export_form extends moodleform {
      * @param stdClass $data portfolio information from form data
      * @return array
      */
-    public function validation($data) {
+    public function validation($data, $files) {
 
         $errors = array();
 
@@ -228,7 +228,7 @@ final class portfolio_admin_form extends moodleform {
      * @param stdObject $data form data
      * @return array
      */
-    public function validation($data) {
+    public function validation($data, $files) {
         global $DB;
 
         $errors = array();
@@ -296,7 +296,7 @@ final class portfolio_user_form extends moodleform {
      *
      * @param stdClass $data form data
      */
-    public function validation($data) {
+    public function validation($data, $files) {
 
         $errors = $this->instance->user_config_validation($data);
 
diff --git a/portfolio/add.php b/portfolio/add.php
index b3c3982df0a..b5a1c4a4e25 100644
--- a/portfolio/add.php
+++ b/portfolio/add.php
@@ -221,7 +221,8 @@ if (!$exporter->get('instance')) {
         throw new portfolio_export_exception($exporter, 'noavailableplugins', 'portfolio');
     } else if (count($options) == 1) {
         // no point displaying a form, just redirect.
-        $instance = array_shift(array_keys($options));
+        $optionskeys = array_keys($options);
+        $instance = array_shift($optionskeys);
         redirect($CFG->wwwroot . '/portfolio/add.php?id= ' . $exporter->get('id') . '&instance=' . $instance . '&sesskey=' . sesskey());
     }
     // be very selective about not including this unless we really need to
-- 
2.43.0