Fixed some issues in smallpages template plugin

diff --git a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
index 8bbd739b4f57321a37de0e007f22991ebdf3de75..c0d20bf2ad5bab5be7ae1b0f78b9f0ef1bb636a5 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
@@ -2,7 +2,6 @@
 namespace wcf\system\template\plugin;
 use wcf\system\exception\SystemException;
 use wcf\system\request\LinkHandler;
-use wcf\system\request\RouteHandler;
 use wcf\system\style\StyleHandler;
 use wcf\system\template\TemplateEngine;
 use wcf\system\WCF;

diff --git a/wcfsetup/install/files/lib/system/template/plugin/SmallpagesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/SmallpagesFunctionTemplatePlugin.class.php
index 8be38bf770786fbbce564aa17bbd9b2162b0a659..bd4d7abaeb247798cfc41c417503597a0377ea7d 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/plugin/SmallpagesFunctionTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/SmallpagesFunctionTemplatePlugin.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system\template\plugin;
 use wcf\system\exception\SystemException;
+use wcf\system\request\LinkHandler;
 use wcf\system\template\TemplateEngine;
 use wcf\system\WCF;
 use wcf\util\StringUtil;
@@ -55,21 +56,27 @@ class SmallpagesFunctionTemplatePlugin implements IFunctionTemplatePlugin {
         * @see wcf\system\template\IFunctionTemplatePlugin::execute()
         */
        public function execute($tagArgs, TemplateEngine $tplObj) {
-               // needed params: link, pages
-               if (!isset($tagArgs['link'])) throw new SystemException("missing 'link' argument in pages tag");
+               // needed params: controller, link, pages
+               if (!isset($tagArgs['link'])) throw new SystemException("missing 'link' argument in smallpages tag");
+               if (!isset($tagArgs['controller'])) throw new SystemException("missing 'controller' argument in smallpages tag");
                if (!isset($tagArgs['pages'])) {
                        if (($tagArgs['pages'] = $tplObj->get('pages')) === null) {
-                               throw new SystemException("missing 'pages' argument in pages tag");
+                               throw new SystemException("missing 'pages' argument in smallpages tag");
                        }
                }
                
                $html = '';
                if ($tagArgs['pages'] > 1) {
-                       // encode link
-                       $link = StringUtil::encodeHTML($tagArgs['link']);
-               
+                       // create and encode route link
+                       $parameters = array();
+                       if (isset($tagArgs['id'])) $parameters['id'] = $tagArgs['id'];
+                       if (isset($tagArgs['title'])) $parameters['title'] = $tagArgs['title'];
+                       if (isset($tagArgs['object'])) $parameters['object'] = $tagArgs['object'];
+                       if (isset($tagArgs['application'])) $parameters['application'] = $tagArgs['application'];
+                       $link = StringUtil::encodeHTML(LinkHandler::getInstance()->getLink($tagArgs['controller'], $parameters, $tagArgs['link']));
+                       
                        // open div and ul
-                       $html .= "<div class=\"pageNavigation\">\n<ul>\n";
+                       $html .= "<div class=\"pageNavigation\" data-link=\"".$link."\">\n<ul>\n";
                        
                        // generate simple links
                        $simpleLinks = $tagArgs['pages'];