Merge remote-tracking branch 'upstream/master' into GH-3201

Author: christianbeeznest

public/main/lp/lp_add.php

@@ -36,22 +36,35 @@ function activate_end_date() {
 
 /* Constants and variables */
 
-$is_allowed_to_edit = api_is_allowed_to_create_course();
-$isStudentView = filter_var($_REQUEST['isStudentView'] ?? 'false', FILTER_VALIDATE_BOOLEAN);
 $lpId = (int)($_REQUEST['lp_id'] ?? 0);
+$is_allowed_to_edit = api_is_allowed_to_edit(false, true, false, false);
+
+// Only treat student view as enabled if it was explicitly passed in the URL.
+// This avoids picking it up from cookies/$_REQUEST.
+$rawQuery = $_SERVER['QUERY_STRING'] ?? '';
+$hasStudentViewInUrl = preg_match('/(?:^|&)isStudentView=/i', $rawQuery) === 1;
+$isStudentView = $hasStudentViewInUrl
+    ? filter_var($_GET['isStudentView'] ?? 'false', FILTER_VALIDATE_BOOLEAN)
+    : false;
 
 if (!$is_allowed_to_edit || $isStudentView) {
     $course = api_get_course_entity(api_get_course_int_id());
-    $nodeId = method_exists($course,'getResourceNode') && $course->getResourceNode()
-        ? (int)$course->getResourceNode()->getId()
+    $nodeId = method_exists($course, 'getResourceNode') && $course->getResourceNode()
+        ? (int) $course->getResourceNode()->getId()
         : 0;
 
-    $cid = (int)($_REQUEST['cid'] ?? api_get_course_int_id());
-    $sid = (int)($_REQUEST['sid'] ?? api_get_session_id());
-    $qs = ['cid' => $cid, 'isStudentView' => 'true'];
+    $cid = (int) ($_REQUEST['cid'] ?? api_get_course_int_id());
+    $sid = (int) ($_REQUEST['sid'] ?? api_get_session_id());
+
+    $qs = ['cid' => $cid];
     if ($sid > 0) $qs['sid'] = $sid;
-    if (isset($_REQUEST['gid']))       $qs['gid'] = (int)$_REQUEST['gid'];
-    if (isset($_REQUEST['gradebook'])) $qs['gradebook'] = (int)$_REQUEST['gradebook'];
+    if (isset($_REQUEST['gid']))       $qs['gid'] = (int) $_REQUEST['gid'];
+    if (isset($_REQUEST['gradebook'])) $qs['gradebook'] = (int) $_REQUEST['gradebook'];
+
+    // Preserve student view only if it was explicitly requested.
+    if ($isStudentView) {
+        $qs['isStudentView'] = 'true';
+    }
 
     $listUrl = api_get_path(WEB_PATH).'resources/lp/'.$nodeId.'?'.http_build_query($qs);
     header('Location: '.$listUrl);

src/CoreBundle/Entity/ExtraFieldOptions.php

@@ -45,18 +45,12 @@ class ExtraFieldOptions
     #[Gedmo\Locale]
     private ?string $locale = null;
 
-    /**
-     * @return int
-     */
-    public function getId()
+    public function getId(): ?int
     {
         return $this->id;
     }
 
-    /**
-     * @return int
-     */
-    public function getOptionOrder()
+    public function getOptionOrder(): ?int
     {
         return $this->optionOrder;
     }
@@ -80,10 +74,7 @@ public function setField(ExtraField $field): self
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getValue()
+    public function getValue(): ?string
     {
         return $this->value;
     }
@@ -131,6 +122,18 @@ public function setPriorityMessage(string $priorityMessage): self
         return $this;
     }
 
+    /**
+     * Backward-compatibility alias for legacy code calling setLocale().
+     * Gedmo Translatable expects the locale to be injected through the "Locale" field.
+     */
+    public function setLocale(string $locale): self
+    {
+        return $this->setTranslatableLocale($locale);
+    }
+
+    /**
+     * Sets the locale used by Gedmo Translatable for this entity.
+     */
     public function setTranslatableLocale(string $locale): self
     {
         $this->locale = $locale;