MDL-29857 - portfolio: Fix E_STRICT errors

diff --git a/lib/portfolio/forms.php b/lib/portfolio/forms.php
index ba408f7..7b7c669 100644 (file)
--- 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
      */
      * @param stdClass $data portfolio information from form data
      * @return array
      */

-    public function validation($data) {
+    public function validation($data, $files) {

 
         $errors = array();
 
 
         $errors = array();
 


@@ -228,7 +228,7 @@ final class portfolio_admin_form extends moodleform {
      * @param stdObject $data form data
      * @return array
      */
      * @param stdObject $data form data
      * @return array
      */

-    public function validation($data) {
+    public function validation($data, $files) {

         global $DB;
 
         $errors = array();
         global $DB;
 
         $errors = array();


@@ -296,7 +296,7 @@ final class portfolio_user_form extends moodleform {
      *
      * @param stdClass $data form data
      */
      *
      * @param stdClass $data form data
      */

-    public function validation($data) {
+    public function validation($data, $files) {

 
         $errors = $this->instance->user_config_validation($data);
 
 
         $errors = $this->instance->user_config_validation($data);
 

diff --git a/portfolio/add.php b/portfolio/add.php
index b3c3982..b5a1c4a 100644 (file)
--- 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.
         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
         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