Fix rawurlencode null arg deprecation warning

BNETDocs · Jan 6, 2025 · e3f2c6b · e3f2c6b
1 parent 33f8de6
commit e3f2c6b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Controllers/Document/Edit.php b/src/Controllers/Document/Edit.php
@@ -19,15 +19,15 @@ public function invoke(?array $args): bool
     $this->model->acl_allowed = $this->model->active_user
       && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_DOCUMENT_MODIFY);
 
+    $this->model->document_id = Router::query()['id'] ?? null;
+
     if (!$this->model->acl_allowed)
     {
       $this->model->_responseCode = HttpCode::HTTP_FORBIDDEN;
       $this->model->error = $this->model->active_user ? EditModel::ERROR_ACL_NOT_SET : EditModel::ERROR_NOT_LOGGED_IN;
       return true;
     }
 
-    $this->model->document_id = Router::query()['id'] ?? null;
-
     try { $this->model->document = new \BNETDocs\Libraries\Document($this->model->document_id); }
     catch (\UnexpectedValueException) { $this->model->document = null; }
 

diff --git a/src/Templates/Document/Edit.phtml b/src/Templates/Document/Edit.phtml
@@ -8,7 +8,7 @@ $description = 'This form allows an individual to edit a document.';
 $url = '/document/edit';
 $comments = $this->getContext()->comments;
 $document_id = $this->getContext()->document_id;
-$document_url = ($this->getContext()->document ? $this->getContext()->document->getURI() : UrlFormatter::format('/document/' . rawurlencode($document_id)));
+$document_url = ($this->getContext()->document ? $this->getContext()->document->getURI() : UrlFormatter::format('/document/' . rawurlencode($document_id ?? '')));
 $error = $this->getContext()->error;
 switch ($error)
 {