[advancedcontentfilter] Stop using advancedcontentfilter_get_rules() outside of route...

- This used to work with Slim v2, but the new requirements for module functions broke it

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 55bc500..418b253 100644 (file)
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -253,7 +253,7 @@ function advancedcontentfilter_content()
                                'cancel'            => DI::l10n()->t('Cancel'),
                        ],
                        '$current_theme' => DI::app()->getCurrentTheme(),
-                       '$rules' => advancedcontentfilter_get_rules(),
+                       '$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])),
                        '$form_security_token' => BaseModule::getFormSecurityToken()
                ]);
        }
@@ -305,7 +305,7 @@ function advancedcontentfilter_build_fields($data)
  * API
  */
 
-function advancedcontentfilter_get_rules(ServerRequestInterface $request, ResponseInterface $response)
+function advancedcontentfilter_get_rules(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
 {
        if (!DI::userSession()->getLocalUserId()) {
                throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));

diff --git a/advancedcontentfilter/templates/settings.tpl b/advancedcontentfilter/templates/settings.tpl
index c9dfbe3..8b82e59 100644 (file)
--- a/advancedcontentfilter/templates/settings.tpl
+++ b/advancedcontentfilter/templates/settings.tpl
@@ -3,7 +3,7 @@
        <div id="rules"></div>
 
        <script>
-               var existingRules = {{$rules nofilter}};
+               var existingRules = {{$rules|json_encode nofilter}};
 
                var messages = {
        {{foreach $messages as $key => $value}}