MDL-19773 - Cannot have code like $SESSION->feedback = new object(); in mod/feedback...

diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index 019eca35dec16691146116eea46114c37c07fc07..c0976970cdb8a0c16a371b6e77d0cca63145ec07 100644 (file)
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -12,6 +12,8 @@
     require_once("lib.php");
     require_once($CFG->libdir . '/completionlib.php');
 
+    feedback_init_feedback_session();
+
     $id = required_param('id', PARAM_INT);
     $completedid = optional_param('completedid', false, PARAM_INT);
     $preservevalues  = optional_param('preservevalues', 0,  PARAM_INT);

diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index 0d196d049213a5048bb523c9bc0a36b5b3c6e814..63a9e87b41aae750a5a3b89f1c3af7f2f6f468bd 100644 (file)
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -11,6 +11,8 @@
     require_once("../../config.php");
     require_once("lib.php");
 
+    feedback_init_feedback_session();
+
     $id = required_param('id', PARAM_INT);
     $completedid = optional_param('completedid', false, PARAM_INT);
     $preservevalues  = optional_param('preservevalues', 0,  PARAM_INT);

diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
index ffe41f70e492e26c8f732f2aac0f2e234b50057d..c778d6b407308d6152ab2b230e397bbdc983ec5e 100644 (file)
--- a/mod/feedback/edit.php
+++ b/mod/feedback/edit.php
@@ -12,6 +12,8 @@
     require_once("lib.php");
     require_once('edit_form.php');
 
+    feedback_init_feedback_session();
+
     $id = required_param('id', PARAM_INT);
 
     if(($formdata = data_submitted()) AND !confirm_sesskey()) {

diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php
index 46359c4247b7d22fa0eb61741cd02d8b76286b0b..244c7f57be739314d5850165f4ac6ded4458a5df 100644 (file)
--- a/mod/feedback/edit_item.php
+++ b/mod/feedback/edit_item.php
@@ -11,6 +11,8 @@
     require_once("../../config.php");
     require_once("lib.php");
 
+    feedback_init_feedback_session();
+
     $id = optional_param('id', NULL, PARAM_INT);
     $typ = optional_param('typ', false, PARAM_ALPHA);
     $itemid = optional_param('itemid', false, PARAM_INT);

diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index 2f7b286283b01a03ecc3d81dc0248cd0f10619c4..2f6455c418528c2d0beae4c648ea69cb15f50e7f 100644 (file)
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -38,14 +38,6 @@ define('FEEDBACK_RESETFORM_RESET', 'feedback_reset_data_');
 define('FEEDBACK_RESETFORM_DROP', 'feedback_drop_feedback_');
 define('FEEDBACK_MAX_PIX_LENGTH', '400'); //max. Breite des grafischen Balkens in der Auswertung
 
-//initialize the feedback-Session - not nice at all!!
-global $SESSION;
-if (!empty($SESSION)) {
-    if (!isset($SESSION->feedback) OR !is_object($SESSION->feedback)) {
-        $SESSION->feedback = new object();
-    }
-}
-
 /**
  * @uses FEATURE_GROUPS
  * @uses FEATURE_GROUPINGS
@@ -2299,6 +2291,8 @@ function feedback_print_errors() {
 
     global $SESSION, $OUTPUT;
 
+    feedback_init_feedback_session();
+
     if(empty($SESSION->feedback->errors)) {
                return;
     }
@@ -2361,4 +2355,14 @@ function feedback_extend_settings_navigation($settings, $module) {
     if (has_capability('moodle/course:manageactivities', $PAGE->cm->context)) {
         $feedbacknav->add(get_string('updatethis', '', get_string('modulename', 'feedback')), new moodle_url($CFG->wwwroot.'/course/mod.php', array('update' => $PAGE->cm->id, 'return' => true, 'sesskey' => sesskey())));
     }
+}
+
+function feedback_init_feedback_session() {
+    //initialize the feedback-Session - not nice at all!!
+    global $SESSION;
+    if (!empty($SESSION)) {
+        if (!isset($SESSION->feedback) OR !is_object($SESSION->feedback)) {
+            $SESSION->feedback = new object();
+        }
+    }
 }
\ No newline at end of file