Merge branch 'MDL-68991-master' of git://github.com/rezaies/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 11 Jun 2020 04:27:16 +0000 (12:27 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 11 Jun 2020 04:27:16 +0000 (12:27 +0800)
1  2 
lib/classes/userfeedback.php
version.php

@@@ -153,7 -153,7 +153,7 @@@ class core_userfeedback 
      public static function can_give_feedback(): bool {
          global $CFG;
  
--        return $CFG->enableuserfeedback && isloggedin() && !isguestuser();
++        return !empty($CFG->enableuserfeedback) && isloggedin() && !isguestuser();
      }
  
      /**
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2020061000.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2020060900.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2020061000.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
  $release  = '3.9rc1 (Build: 20200609)'; // Human-friendly version name