From a44531ae1592cf266e6c24387f49d665c639b480 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun, 24 Feb 2013 13:25:17 +0100
Subject: [PATCH] Fixed #18862 -- Honored script prefix in
 FlatPage.get_absolute_url.

---
 django/contrib/flatpages/models.py       | 4 +++-
 django/contrib/flatpages/tests/models.py | 9 ++++++++-
 django/core/urlresolvers.py              | 9 +++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/django/contrib/flatpages/models.py b/django/contrib/flatpages/models.py
index 7378c8c96b..896bfa3eac 100644
--- a/django/contrib/flatpages/models.py
+++ b/django/contrib/flatpages/models.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 
 from django.db import models
 from django.contrib.sites.models import Site
+from django.core.urlresolvers import get_script_prefix
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import iri_to_uri, python_2_unicode_compatible
 
@@ -26,4 +27,5 @@ class FlatPage(models.Model):
         return "%s -- %s" % (self.url, self.title)
 
     def get_absolute_url(self):
-        return iri_to_uri(self.url)
+        # Handle script prefix manually because we bypass reverse()
+        return iri_to_uri(get_script_prefix().rstrip('/') + self.url)
diff --git a/django/contrib/flatpages/tests/models.py b/django/contrib/flatpages/tests/models.py
index 44666d62b0..af12c420e0 100644
--- a/django/contrib/flatpages/tests/models.py
+++ b/django/contrib/flatpages/tests/models.py
@@ -2,6 +2,7 @@
 
 from __future__ import unicode_literals
 
+from django.core.urlresolvers import set_script_prefix, clear_script_prefix
 from django.contrib.flatpages.models import FlatPage
 from django.test import TestCase
 
@@ -12,4 +13,10 @@ class FlatpageModelTests(TestCase):
         pf = FlatPage(title="Café!", url='/café/')
         self.assertEqual(pf.get_absolute_url(), '/caf%C3%A9/')
 
-
+    def test_get_absolute_url_honors_script_prefix(self):
+        pf = FlatPage(title="Tea!", url='/tea/')
+        set_script_prefix('/beverages/')
+        try:
+            self.assertEqual(pf.get_absolute_url(), '/beverages/tea/')
+        finally:
+            clear_script_prefix()
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
index c657fd9a54..e8d6a46c68 100644
--- a/django/core/urlresolvers.py
+++ b/django/core/urlresolvers.py
@@ -521,6 +521,15 @@ def get_script_prefix():
     """
     return getattr(_prefixes, "value", '/')
 
+def clear_script_prefix():
+    """
+    Unsets the script prefix for the current thread.
+    """
+    try:
+        del _prefixes.value
+    except AttributeError:
+        pass
+
 def set_urlconf(urlconf_name):
     """
     Sets the URLconf for the current thread (overriding the default one in