From af0899ae2a3b84cf240a96591ebe0e5d360416ca Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Mon, 16 Jun 2014 16:02:11 +0200
Subject: [PATCH] Fixes wrongly generated relative urls for pagination.

When `RELATIVE_URLS` is `True` and the `PAGINATION_PATTERNS` adds folder to the path, the relative urls to these pages does not respect these additional folders.

Example:
	Settings:
			RELATIVE_URLS = True
			PAGINATION_PATTERNS = (
					(1, '{base_name}/', '{base_name}/index.html'),
					(2, '{base_name}/page/{number}/', '{base_name}/page/{number}/index.html'),)

	Theme:
			<link href="{{ SITEURL }}/theme/css/style.css" rel="stylesheet">

If you are on page 2 then "{{ SITEURL }}/theme/css/style.css" expands to "./theme/css/style.css" instead of "./../../theme/css/style.css".

Fix:
Simply compute the relative url from the paginated url instead of the not paginated one.
---
 pelican/writers.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 61acdadd..ad6e652b 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -151,6 +151,9 @@ class Writer(object):
 
         def _write_file(template, localcontext, output_path, name, override):
             """Render the template write the file."""
+            # set localsiteurl for context so that Contents can adjust links
+            if localcontext['localsiteurl']:
+                context['localsiteurl'] = localcontext['localsiteurl']
             output = template.render(localcontext)
             path = os.path.join(output_path, name)
             try:
@@ -166,14 +169,16 @@ class Writer(object):
             # local context.
             signals.content_written.send(path, context=localcontext)
 
-        localcontext = context.copy()
-        if relative_urls:
-            relative_url = path_to_url(get_relative_path(name))
-            context['localsiteurl'] = relative_url
-            localcontext['SITEURL'] = relative_url
-
-        localcontext['output_file'] = name
-        localcontext.update(kwargs)
+        def _get_localcontext(context, name, kwargs, relative_urls):
+            localcontext = context.copy()
+            localcontext['localsiteurl'] = localcontext.get('localsiteurl', None)
+            if relative_urls:
+                relative_url = path_to_url(get_relative_path(name))
+                localcontext['SITEURL'] = relative_url
+                localcontext['localsiteurl'] = relative_url
+            localcontext['output_file'] = name
+            localcontext.update(kwargs)
+            return localcontext
 
         # pagination
         if paginated:
@@ -184,7 +189,7 @@ class Writer(object):
 
             # generated pages, and write
             for page_num in range(list(paginators.values())[0].num_pages):
-                paginated_localcontext = localcontext.copy()
+                paginated_kwargs = kwargs.copy()
                 for key in paginators.keys():
                     paginator = paginators[key]
                     previous_page = paginator.page(page_num) \
@@ -192,15 +197,17 @@ class Writer(object):
                     page = paginator.page(page_num + 1)
                     next_page = paginator.page(page_num + 2) \
                         if page_num + 1 < paginator.num_pages else None
-                    paginated_localcontext.update(
+                    paginated_kwargs.update(
                         {'%s_paginator' % key: paginator,
                          '%s_page' % key: page,
                          '%s_previous_page' % key: previous_page,
                          '%s_next_page' % key: next_page})
 
-                _write_file(template, paginated_localcontext, self.output_path,
+                localcontext = _get_localcontext(context, page.save_as, paginated_kwargs, relative_urls)
+                _write_file(template, localcontext, self.output_path,
                             page.save_as, override_output)
         else:
             # no pagination
+            localcontext = _get_localcontext(context, name, kwargs, relative_urls)
             _write_file(template, localcontext, self.output_path, name,
                         override_output)