pkp#9434 Updated hook call and fixed handler related bug

touhidurabir · Jun 21, 2024 · bbaa342 · bbaa342
1 parent c4a48c2
commit bbaa342
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/classes/core/PKPRequest.php b/classes/core/PKPRequest.php
@@ -650,10 +650,10 @@ public function getUserVar($key)
     {
         // special treatment for APIRouter. APIHandler gets to fetch parameter first
         $router = $this->getRouter();
+
         if ($router instanceof \PKP\core\APIRouter && (!is_null($handler = $router->getHandler()))) {
-            /** @var APIHandler */
-            $handler = $router->getHandler();
-            $value = $handler->getParameter($key);
+            $handler = $router->getHandler(); /** @var \PKP\handler\APIHandler $handler */
+            $value = $handler->getApiController()->getParameter($key);
             if (!is_null($value)) {
                 return $value;
             }

diff --git a/classes/handler/APIHandler.php b/classes/handler/APIHandler.php
@@ -56,7 +56,9 @@ public function __construct(PKPBaseController $controller)
     {
         parent::__construct();
 
-        Hook::call('APIHandler::endpoints', [&$controller, $this]);
+        $router = $controller->getRequest()->getRouter(); /** @var \PKP\core\APIRouter $router */
+
+        Hook::run("APIHandler::endpoints::{$router->getEntity()}", [&$controller, $this]);
 
         $this->apiController = $controller;