Merge branch 'MDL-79433-402' of https://github.com/paulholden/moodle into MOODLE_402_STABLE

lib/editor/tiny/plugins/autosave/classes/external/reset_autosave_session.php

@@ -62,7 +62,6 @@ class reset_autosave_session extends external_api {
         string $pageinstance,
         string $elementid
     ): array {
-        global $DB, $USER;
 
         [
             'contextid' => $contextid,
@@ -77,8 +76,11 @@ class reset_autosave_session extends external_api {
 
         ]);
 
-        $manager = new \tiny_autosave\autosave_manager($contextid, $pagehash, $pageinstance, $elementid);
-        $manager->remove_autosave_record();
+        // May have been called by a non-logged in user.
+        if (isloggedin() && !isguestuser()) {
+            $manager = new \tiny_autosave\autosave_manager($contextid, $pagehash, $pageinstance, $elementid);
+            $manager->remove_autosave_record();
+        }
 
         return [];
     }

lib/editor/tiny/plugins/autosave/classes/external/resume_autosave_session.php

@@ -71,7 +71,6 @@ class resume_autosave_session extends external_api {
         string $elementid,
         ?int $draftid
     ): array {
-        global $DB, $USER;
 
         [
             'contextid' => $contextid,
@@ -87,10 +86,15 @@ class resume_autosave_session extends external_api {
             'draftid' => $draftid,
         ]);
 
-        $manager = new \tiny_autosave\autosave_manager($contextid, $pagehash, $pageinstance, $elementid);
-        $sessiondata = $manager->resume_autosave_session($draftid);
+        $drafttext = '';
+
+        // May have been called by a non-logged in user.
+        if (isloggedin() && !isguestuser()) {
+            $manager = new \tiny_autosave\autosave_manager($contextid, $pagehash, $pageinstance, $elementid);
+            $drafttext = $manager->resume_autosave_session($draftid)->drafttext;
+        }
         return [
-            'drafttext' => $sessiondata->drafttext,
+            'drafttext' => $drafttext,
         ];
     }
 

lib/editor/tiny/plugins/autosave/classes/external/update_autosave_session_content.php

@@ -65,7 +65,6 @@ class update_autosave_session_content extends external_api {
         string $elementid,
         string $drafttext
     ): array {
-        global $DB, $USER;
 
         [
             'contextid' => $contextid,
@@ -81,8 +80,11 @@ class update_autosave_session_content extends external_api {
             'drafttext' => $drafttext,
         ]);
 
-        $manager = new \tiny_autosave\autosave_manager($contextid, $pagehash, $pageinstance, $elementid);
-        $manager->update_autosave_record($drafttext);
+        // May have been called by a non-logged in user.
+        if (isloggedin() && !isguestuser()) {
+            $manager = new \tiny_autosave\autosave_manager($contextid, $pagehash, $pageinstance, $elementid);
+            $manager->update_autosave_record($drafttext);
+        }
 
         return [];
     }

lib/editor/tiny/plugins/autosave/db/services.php

@@ -30,6 +30,7 @@ $functions = [
         'methodname' => 'execute',
         'description' => 'Resume an autosave session',
         'type' => 'write',
+        'loginrequired' => false,
         'ajax' => true,
     ),
     'tiny_autosave_reset_session' => array(
@@ -37,6 +38,7 @@ $functions = [
         'methodname' => 'execute',
         'description' => 'Reset an autosave session',
         'type' => 'write',
+        'loginrequired' => false,
         'ajax' => true,
     ),
     'tiny_autosave_update_session' => array(
@@ -44,6 +46,7 @@ $functions = [
         'methodname' => 'execute',
         'description' => 'Update an autosave session',
         'type' => 'write',
+        'loginrequired' => false,
         'ajax' => true,
     ),
 ];

lib/editor/tiny/plugins/autosave/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023042400;
+$plugin->version   = 2023042401;
 $plugin->requires  = 2023041800;
 $plugin->component = 'tiny_autosave';