From 7d43c4fa00fa31c9ef445a5f923255da870bf650 Mon Sep 17 00:00:00 2001
From: Honza Javorek <jan.javorek@gmail.com>
Date: Tue, 24 Sep 2013 15:18:09 +0200
Subject: [PATCH] Support for params and fragments in intrasite links. Adresses
 #1063.

---
 pelican/contents.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 1858013c..83fbad8f 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -5,6 +5,7 @@ import six
 import copy
 import locale
 import logging
+import urlparse
 import functools
 import os
 import re
@@ -194,30 +195,36 @@ class Content(object):
 
         def replacer(m):
             what = m.group('what')
-            value = m.group('value')
+            value = urlparse.urlparse(m.group('value'))
+            path = value.path
             origin = m.group('path')
 
             # XXX Put this in a different location.
             if what == 'filename':
-                if value.startswith('/'):
-                    value = value[1:]
+                if path.startswith('/'):
+                    path = path[1:]
                 else:
                     # relative to the source path of this content
-                    value = self.get_relative_source_path(
-                        os.path.join(self.relative_dir, value)
+                    path = self.get_relative_source_path(
+                        os.path.join(self.relative_dir, path)
                     )
 
-                if value in self._context['filenames']:
+                if path in self._context['filenames']:
                     origin = '/'.join((siteurl,
-                             self._context['filenames'][value].url))
-                    origin = origin.replace('\\', '/')  # Fow windows paths.
+                             self._context['filenames'][path].url))
+                    origin = origin.replace('\\', '/')  # for Windows paths.
                 else:
                     logger.warning("Unable to find {fn}, skipping url"
-                                   " replacement".format(fn=value))
+                                   " replacement".format(fn=path))
             elif what == 'category':
-                origin = Category(value, self.settings).url
+                origin = Category(path, self.settings).url
             elif what == 'tag':
-                origin = Tag(value, self.settings).url
+                origin = Tag(path, self.settings).url
+
+            # keep all other parts, such as query, fragment, etc.
+            parts = list(value)
+            parts[2] = origin
+            origin = urlparse.urlunparse(parts)
 
             return ''.join((m.group('markup'), m.group('quote'), origin,
                             m.group('quote')))