From 7c1e123ad63e39784cd7136ecf99fef19feddb17 Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Fri, 5 Sep 2014 10:15:28 +0000
Subject: [PATCH] Do not use style path for pagination generation

---
 .../Handlebars/Helper/GeneratePaginationHelper.php    | 11 ++++-------
 src/mibew/libs/pagination.php                         |  3 +--
 .../templates_src/server_side/redirect.handlebars     |  2 +-
 .../default/templates_src/server_side/bans.handlebars |  2 +-
 .../server_side/canned_messages.handlebars            |  2 +-
 .../templates_src/server_side/history.handlebars      |  2 +-
 .../templates_src/server_side/history_user.handlebars |  2 +-
 .../templates_src/server_side/translations.handlebars |  4 ++--
 8 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/mibew/libs/classes/Mibew/Handlebars/Helper/GeneratePaginationHelper.php b/src/mibew/libs/classes/Mibew/Handlebars/Helper/GeneratePaginationHelper.php
index b3a1a825..ac776824 100644
--- a/src/mibew/libs/classes/Mibew/Handlebars/Helper/GeneratePaginationHelper.php
+++ b/src/mibew/libs/classes/Mibew/Handlebars/Helper/GeneratePaginationHelper.php
@@ -29,10 +29,9 @@ use Handlebars\Template;
  *
  * Example of usage:
  * <code>
- *   {{generatePagination stylePath paginationInfo bottom}}
+ *   {{generatePagination paginationInfo bottom}}
  * </code>
  * where:
- *   - "stylePath" is expression for path to current style.
  *   - "paginationInfo" is 'info' key from the result of setup_pagination
  *     function.
  *   - "bottom": optional argument that indicate if pagination block shoud
@@ -48,16 +47,14 @@ class GeneratePaginationHelper implements HelperInterface
     public function execute(Template $template, Context $context, $args, $source)
     {
         $parsed_args = $template->parseArguments($args);
-        if (empty($parsed_args) || count($parsed_args) < 2) {
+        if (empty($parsed_args) || count($parsed_args) < 1) {
             return '';
         }
 
-        $stylePath = $context->get($parsed_args[0]);
-        $pagination_info = $context->get($parsed_args[1]);
-        $bottom = empty($parsed_args[2]) ? true : $context->get($parsed_args[2]);
+        $pagination_info = $context->get($parsed_args[0]);
+        $bottom = empty($parsed_args[1]) ? true : $context->get($parsed_args[1]);
 
         $pagination = generate_pagination(
-            $stylePath,
             $pagination_info,
             ($bottom === "false") ? false : true
         );
diff --git a/src/mibew/libs/pagination.php b/src/mibew/libs/pagination.php
index 511594e8..7ac72247 100644
--- a/src/mibew/libs/pagination.php
+++ b/src/mibew/libs/pagination.php
@@ -142,14 +142,13 @@ function setup_pagination($items, $default_items_per_page = 15)
 /**
  * Builds HTML markup for pagination pager.
  *
- * @param string $style_path Root path of the style.
  * @param array $pagination Pagination info. See description of the result of
  * pagination_info function for details.
  * @param bool $bottom Indicates if pager will be displayed at the bottom of a
  * page.
  * @return string HTML markup
  */
-function generate_pagination($style_path, $pagination, $bottom = true)
+function generate_pagination($pagination, $bottom = true)
 {
     $result = getlocal(
         'Page {0} of {1}, {2}-{3} from {4}',
diff --git a/src/mibew/styles/dialogs/default/templates_src/server_side/redirect.handlebars b/src/mibew/styles/dialogs/default/templates_src/server_side/redirect.handlebars
index 7c791b41..19c51107 100644
--- a/src/mibew/styles/dialogs/default/templates_src/server_side/redirect.handlebars
+++ b/src/mibew/styles/dialogs/default/templates_src/server_side/redirect.handlebars
@@ -27,6 +27,6 @@
             {{/if}}
         </div>
         <div class="clear">&nbsp;</div>
-        <div class="center">{{generatePagination stylePath pagination}}</div>
+        <div class="center">{{generatePagination pagination}}</div>
     {{/override}}
 {{/extends}}
\ No newline at end of file
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/bans.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/bans.handlebars
index 597e874d..5340c935 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/bans.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/bans.handlebars
@@ -75,7 +75,7 @@
 
         {{#if pagination}}
             <br />
-            {{generatePagination stylePath pagination}}
+            {{generatePagination pagination}}
         {{/if}}
     {{/override}}
 {{/extends}}
\ No newline at end of file
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/canned_messages.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/canned_messages.handlebars
index 997341bc..5d24b26e 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/canned_messages.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/canned_messages.handlebars
@@ -87,7 +87,7 @@
 
         {{#if pagination}}
             <br />
-            {{generatePagination stylePath pagination}}
+            {{generatePagination pagination}}
         {{/if}}
     {{/override}}
 {{/extends}}
\ No newline at end of file
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/history.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/history.handlebars
index d114ceb0..4a447d16 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/history.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/history.handlebars
@@ -98,7 +98,7 @@
 
         {{#if pagination}}
             <br/>
-            {{generatePagination stylePath pagination}}
+            {{generatePagination pagination}}
         {{/if}}
     {{/override}}
 {{/extends}}
\ No newline at end of file
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/history_user.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/history_user.handlebars
index 7da91cc6..b83d7a3b 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/history_user.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/history_user.handlebars
@@ -37,7 +37,7 @@
 
         {{#if pagination}}
             <br />
-            {{generatePagination stylePath pagination}}
+            {{generatePagination pagination}}
         {{/if}}
     {{/override}}
 {{/extends}}
\ No newline at end of file
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/translations.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/translations.handlebars
index c2abfbf9..71e7c621 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/translations.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/translations.handlebars
@@ -47,7 +47,7 @@
 
 
         {{#if pagination}}
-            {{generatePagination stylePath pagination "false"}}
+            {{generatePagination pagination "false"}}
         {{/if}}
 
         <table class="translate">
@@ -80,7 +80,7 @@
 
         {{#if pagination}}
             <br />
-            {{generatePagination stylePath pagination}}
+            {{generatePagination pagination}}
         {{/if}}
     {{/override}}
 {{/extends}}
\ No newline at end of file