Merge pull request #112 from ticktackk/develop

Develop
ticktackk · Jan 6, 2022 · 155e043 · 155e043
2 parents f3a8dc4 + 854e917
commit 155e043
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 ==========================
 
+## 1.3.8 (`1030870`)
+
+- **Fix:** `XF\Api\Templater` error message when calling API endpoints
+- **Fix:** Inability to save phrases via admin control panel
+
 ## 1.3.7 (`1030770`)
 
 - **Change:** On XF 2.2.7+ when minifying JS files go with the stock minifier service (#109)

diff --git a/Listener.php b/Listener.php
@@ -46,28 +46,31 @@ public static function dispatcherPostRender
 
         /** @var ExtendedTemplater $templater */
         $templater = $renderer->getTemplater();
-        $permissionErrors = $templater->getPermissionErrors();
-
-        if (count($permissionErrors))
+        if (\is_callable([$templater, 'getPermissionErrors']))
         {
-            $warningHtml = '<div class="blockMessage blockMessage--warning"><h2 style="margin: 0 0 .5em 0">Permission errors</h2><ul>';
-            foreach ($permissionErrors AS $permissionError)
-            {
-                $warningHtml .= sprintf('<li>%s (%s:%d)</li>',
-                    htmlspecialchars($permissionError['error']),
-                    htmlspecialchars(FileUtil::stripRootPathPrefix($permissionError['file'])),
-                    $permissionError['line']
-                );
-            }
-            $warningHtml .= '</ul></div>';
+            $permissionErrors = $templater->getPermissionErrors();
 
-            if (strpos($content, '<!--XF:EXTRA_OUTPUT-->') !== false)
+            if (count($permissionErrors))
             {
-                $content = str_replace('<!--XF:EXTRA_OUTPUT-->', $warningHtml . '<!--XF:EXTRA_OUTPUT-->', $content);
-            }
-            else
-            {
-                $content = preg_replace('#<body[^>]*>#i', "\\0$warningHtml", $content);
+                $warningHtml = '<div class="blockMessage blockMessage--warning"><h2 style="margin: 0 0 .5em 0">Permission errors</h2><ul>';
+                foreach ($permissionErrors AS $permissionError)
+                {
+                    $warningHtml .= sprintf('<li>%s (%s:%d)</li>',
+                        htmlspecialchars($permissionError['error']),
+                        htmlspecialchars(FileUtil::stripRootPathPrefix($permissionError['file'])),
+                        $permissionError['line']
+                    );
+                }
+                $warningHtml .= '</ul></div>';
+
+                if (strpos($content, '<!--XF:EXTRA_OUTPUT-->') !== false)
+                {
+                    $content = str_replace('<!--XF:EXTRA_OUTPUT-->', $warningHtml . '<!--XF:EXTRA_OUTPUT-->', $content);
+                }
+                else
+                {
+                    $content = preg_replace('#<body[^>]*>#i', "\\0$warningHtml", $content);
+                }
             }
         }
     }

diff --git a/XF/Admin/Controller/Phrase.php b/XF/Admin/Controller/Phrase.php
@@ -56,10 +56,10 @@ public function actionSave(ParameterBag $params)
         $db = $this->app()->db();
         $db->beginTransaction();
 
-        $reply = parent::actionSave($parameterBag);
+        $reply = parent::actionSave($params);
 
         /** @noinspection PhpUndefinedFieldInspection */
-        if (!$parameterBag->phrase_id && $reply instanceof RedirectReply)
+        if (!$params->phrase_id && $reply instanceof RedirectReply)
         {
             $phrases = $this->filter('phrases', 'array');
             if (count($phrases))

diff --git a/addon.json b/addon.json
@@ -2,8 +2,8 @@
     "legacy_addon_id": "",
     "title": "Developer Tools",
     "description": "This add-on provides enhancements for add-on developers.",
-    "version_id": 1030770,
-    "version_string": "1.3.7",
+    "version_id": 1030870,
+    "version_string": "1.3.8",
     "dev": "TickTackk",
     "dev_url": "https://xenforo.com/community/members/ticktackk.90375/",
     "faq_url": "",