Issue #2260 showing .io instead of .org under "Short URLs" (#2335)

* Issue #2260 showing .io instead of .org under "Short URLs" * Indentation issue fixed.
readthedocs · Jul 26, 2016 · c968ff2 · c968ff2
1 parent adfb51c
commit c968ff2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/readthedocs/core/context_processors.py b/readthedocs/core/context_processors.py
@@ -4,6 +4,7 @@
 def readthedocs_processor(request):
 
     exports = {
+        'PUBLIC_DOMAIN': getattr(settings, 'PUBLIC_DOMAIN', None),
         'PRODUCTION_DOMAIN': getattr(settings, 'PRODUCTION_DOMAIN', None),
         'USE_SUBDOMAINS': getattr(settings, 'USE_SUBDOMAINS', None),
         'GLOBAL_ANALYTICS_CODE': getattr(settings, 'GLOBAL_ANALYTICS_CODE', 'UA-17997319-1'),

diff --git a/readthedocs/templates/core/project_detail_right.html b/readthedocs/templates/core/project_detail_right.html
@@ -85,8 +85,8 @@ <h3>{% trans "Project Privacy Level" %}</h3>
 {% block short-urls %}
   <h3>{% trans "Short URLs" %}</h3>
   <p>
-    <a href="http://{{ project.slug}}.{{ PRODUCTION_DOMAIN }}">{{ project.slug }}.{{ PRODUCTION_DOMAIN }}</a><br>
-    {% if PRODUCTION_DOMAIN == "readthedocs.org" %}
+    <a href="http://{{ project.slug}}.{{ PUBLIC_DOMAIN }}">{{ project.slug }}.{{ PUBLIC_DOMAIN }}</a><br>
+    {% if PUBLIC_DOMAIN == "readthedocs.io" %}
     <a href="http://{{ project.slug}}.rtfd.io">{{ project.slug }}.rtfd.io</a>
     {% endif %}
   </p>