Casting $course->modinfo to string prevents one notice to

be showed when it's null, returning false as desired.

diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php
index 002813ccaf248a23aee6a112660c72ab3c9c9892..691f53222306c356f13ef79ee7c16f63f454a641 100644 (file)
--- a/blocks/site_main_menu/block_site_main_menu.php
+++ b/blocks/site_main_menu/block_site_main_menu.php
@@ -51,11 +51,9 @@ class block_site_main_menu extends block_list {
             $strcancel= get_string('cancel');
             $stractivityclipboard = $USER->activitycopyname;
         }
-        if ($course->modinfo !== NULL) {
-            $modinfo = unserialize($course->modinfo);
-        } else {
-            $modinfo = null;
-        }
+    /// Casting $course->modinfo to string prevents one notice when the field is null
+        $modinfo = unserialize((string)$course->modinfo);
+
         $editbuttons = '';
 
         if ($ismoving) {

diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php
index cd166a87efec73b9bf9a7e3e2c6a2e55952a49c2..c18d45179671fba286db20206bcf513cb2f28e0d 100644 (file)
--- a/blocks/social_activities/block_social_activities.php
+++ b/blocks/social_activities/block_social_activities.php
@@ -46,8 +46,8 @@ class block_social_activities extends block_list {
             $strcancel= get_string('cancel');
             $stractivityclipboard = $USER->activitycopyname;
         }
-
-        $modinfo = unserialize($course->modinfo);
+    /// Casting $course->modinfo to string prevents one notice when the field is null
+        $modinfo = unserialize((string)$course->modinfo);
         $editbuttons = '';
 
         if ($ismoving) {
@@ -126,4 +126,4 @@ class block_social_activities extends block_list {
     }
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/course/lib.php b/course/lib.php
index 08d3af38477ca65bf9e51570dcca9f80c475d97c..20ddc2302b067177bbeff9cffaee97265b4e59c0 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -60,7 +60,8 @@ function print_recent_selector_form($course, $advancedfilter=0, $selecteduser=0,
 
         $selectedactivity = $modid;
 
-        if ($modinfo = unserialize($course->modinfo)) {
+    /// Casting $course->modinfo to string prevents one notice when the field is null
+        if ($modinfo = unserialize((string)$course->modinfo)) {
             $section = 0;
             if ($course->format == 'weeks') {  // Body
                 $strsection = get_string("week");
@@ -1082,7 +1083,8 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
     }
     $labelformatoptions->noclean = true;
 
-    $modinfo = unserialize($course->modinfo);
+/// Casting $course->modinfo to string prevents one notice when the field is null
+    $modinfo = unserialize((string)$course->modinfo);
 
     //Acccessibility: replace table with list <ul>, but don't output empty list.
     if (!empty($section->sequence)) {

diff --git a/course/report/log/lib.php b/course/report/log/lib.php
index b29010fa564c056120469444ff9d268becdfbcf4..90952c679f8804f9ebc37a97ff3515f30b3fa579 100644 (file)
--- a/course/report/log/lib.php
+++ b/course/report/log/lib.php
@@ -71,7 +71,8 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today'
     $activities = array();
     $selectedactivity = "";
 
-    if ($modinfo = unserialize($course->modinfo)) {
+/// Casting $course->modinfo to string prevents one notice when the field is null
+    if ($modinfo = unserialize((string)$course->modinfo)) {
         $section = 0;
         if ($course->format == 'weeks') {  // Bodgy
             $strsection = get_string("week");
@@ -217,4 +218,4 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today'
     echo "</center>";
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/filter/activitynames/filter.php b/filter/activitynames/filter.php
index 21c375825804e98e60c299833da05c87d7a8ca9e..1274a55f110048368e4c5b75d289fe47ad470709 100644 (file)
--- a/filter/activitynames/filter.php
+++ b/filter/activitynames/filter.php
@@ -19,7 +19,8 @@
         if (empty($activitylist)) {
 
             $course = get_record("course","id",$courseid);
-            $modinfo = unserialize($course->modinfo);
+        /// Casting $course->modinfo to string prevents one notice when the field is null
+            $modinfo = unserialize((string)$course->modinfo);
 
             if (!empty($modinfo)) {
 

diff --git a/lib/datalib.php b/lib/datalib.php
index 48a935cb0494ead6e468adb96aa7f2c6b5b61adf..d2f081cd278b2a0fa76779b6fad397d7d48b37c6 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1447,8 +1447,9 @@ function get_all_instances_in_courses($modulename,$courses) {
         } else {
             $invisible = 0;
         }
-        
-        if (!$modinfo = unserialize($course->modinfo)) {
+
+   /// Casting $course->modinfo to string prevents one notice when the field is null
+        if (!$modinfo = unserialize((string)$course->modinfo)) {
             continue;
         }
         foreach ($modinfo as $mod) {
@@ -1482,7 +1483,8 @@ function get_all_instances_in_course($modulename, $course) {
 
     global $CFG;
 
-    if (!$modinfo = unserialize($course->modinfo)) {
+/// Casting $course->modinfo to string prevents one notice when the field is null
+    if (!$modinfo = unserialize((string)$course->modinfo)) {
         return array();
     }
 

diff --git a/lib/weblib.php b/lib/weblib.php
index 273d1426a4fd45dc86bb4d8d912d96d170602394..083a1388e90c661e93af58c78b1c29d34ecffaf4 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -3934,7 +3934,8 @@ function navmenu($course, $cm=NULL, $targetwindow='self') {
     }
     $strjumpto = get_string('jumpto');
 
-    if (!$modinfo = unserialize($course->modinfo)) {
+/// Casting $course->modinfo to string prevents one notice when the field is null
+    if (!$modinfo = unserialize((string)$course->modinfo)) {
         return '';
     }
     $isteacher = isteacher($course->id);