From 352f4eb2fc2e1b1ed331c930005a92877570353e Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <erisds@gmail.com>
Date: Thu, 14 Apr 2016 11:22:23 +0100
Subject: [PATCH] Fixing undefined page case for page_url helper

closes #6719

- covers the case that no page should be the same as page 1
---
 core/server/helpers/page_url.js                |  4 ++++
 core/test/unit/server_helpers/page_url_spec.js | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/core/server/helpers/page_url.js b/core/server/helpers/page_url.js
index d94be01818..f54966a4c4 100644
--- a/core/server/helpers/page_url.js
+++ b/core/server/helpers/page_url.js
@@ -15,6 +15,10 @@ var errors          = require('../errors'),
     pageUrl;
 
 page_url = function (page, options) {
+    if (!options) {
+        options = page;
+        page = 1;
+    }
     return getPaginatedUrl(page, options.data.root);
 };
 
diff --git a/core/test/unit/server_helpers/page_url_spec.js b/core/test/unit/server_helpers/page_url_spec.js
index dadf3e7b5d..1e549aa024 100644
--- a/core/test/unit/server_helpers/page_url_spec.js
+++ b/core/test/unit/server_helpers/page_url_spec.js
@@ -45,6 +45,14 @@ describe('{{page_url}} helper', function () {
         helpers.page_url('next', options).should.eql('/tag/pumpkin/page/10/');
         helpers.page_url('prev', options).should.eql('/tag/pumpkin/page/2/');
     });
+
+    it('should assume 1 if page is undefined', function () {
+        options.data.root.relativeUrl = '/tag/pumpkin/';
+        options.data.root.pagination.next = 10;
+        options.data.root.pagination.prev = 2;
+
+        helpers.page_url(options).should.equal(helpers.page_url(1, options));
+    });
 });
 
 describe('{{pageUrl}} helper [DEPRECATED]', function () {
@@ -63,6 +71,7 @@ describe('{{pageUrl}} helper [DEPRECATED]', function () {
         options.data.root.pagination.next = 5;
         options.data.root.pagination.prev = 7;
 
+        helpers.pageUrl(options).should.eql(helpers.page_url(options));
         helpers.pageUrl(1, options).should.eql(helpers.page_url(1, options));
         helpers.pageUrl(20, options).should.eql(helpers.page_url(20, options));
         helpers.pageUrl('next', options).should.eql(helpers.page_url('next', options));
@@ -74,6 +83,7 @@ describe('{{pageUrl}} helper [DEPRECATED]', function () {
         options.data.root.pagination.next = 12;
         options.data.root.pagination.prev = 9;
 
+        helpers.pageUrl(options).should.eql(helpers.page_url(options));
         helpers.pageUrl(1, options).should.eql(helpers.page_url(1, options));
         helpers.pageUrl(20, options).should.eql(helpers.page_url(20, options));
         helpers.pageUrl('next', options).should.eql(helpers.page_url('next', options));