From 050d231375ccd15080c04df786df2b45b1a988d6 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Mon, 13 May 2013 10:48:12 -0700
Subject: [PATCH] revert 3ee20d2

---
 app/assets/stylesheets/specific/wiki_pages.css.scss | 5 -----
 app/controllers/wiki_pages_controller.rb            | 8 ++------
 app/helpers/wiki_pages_helper.rb                    | 2 +-
 app/views/wiki_pages/show.html.erb                  | 4 ----
 app/views/wiki_pages/show_or_new.html.erb           | 9 ++-------
 5 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/specific/wiki_pages.css.scss b/app/assets/stylesheets/specific/wiki_pages.css.scss
index feab83c89..6c114ec19 100644
--- a/app/assets/stylesheets/specific/wiki_pages.css.scss
+++ b/app/assets/stylesheets/specific/wiki_pages.css.scss
@@ -27,9 +27,4 @@ div#c-wiki-pages {
     margin-left: 15em;
     padding-left: 1em;
   }
-
-  div.redirected-from {
-    font-size: 0.8em;
-    margin-bottom: 1em;
-  }
 }
diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb
index ce2690368..a3ca8ee28 100644
--- a/app/controllers/wiki_pages_controller.rb
+++ b/app/controllers/wiki_pages_controller.rb
@@ -67,12 +67,8 @@ class WikiPagesController < ApplicationController
 
   def show_or_new
     @wiki_page = WikiPage.find_by_title(params[:title])
-    tag_alias = TagAlias.where("status = 'active' and antecedent_name = ?", params[:title]).first
-
-    if tag_alias && params[:no_redirect].blank?
-      redirect_to show_or_new_wiki_pages_path(:title => tag_alias.consequent_name, :redirected_from => params[:title])
-    elsif @wiki_page
-      redirect_to wiki_page_path(@wiki_page, :redirected_from => params[:redirected_from])
+    if @wiki_page
+      redirect_to wiki_page_path(@wiki_page)
     else
       @wiki_page = WikiPage.new(:title => params[:title])
       respond_with(@wiki_page)
diff --git a/app/helpers/wiki_pages_helper.rb b/app/helpers/wiki_pages_helper.rb
index c0506de35..382b6ae9b 100644
--- a/app/helpers/wiki_pages_helper.rb
+++ b/app/helpers/wiki_pages_helper.rb
@@ -15,7 +15,7 @@ module WikiPagesHelper
 
     if consequent_aliases.any?
       html << "<p class='hint'>The following tags are aliased to this tag: "
-      html << raw(consequent_aliases.map {|x| link_to(x.antecedent_name, show_or_new_wiki_pages_path(:title => x.antecedent_name, :no_redirect => true))}.join(", "))
+      html << raw(consequent_aliases.map {|x| link_to(x.antecedent_name, show_or_new_wiki_pages_path(:title => x.antecedent_name))}.join(", "))
       html << ".</p>"
     end
 
diff --git a/app/views/wiki_pages/show.html.erb b/app/views/wiki_pages/show.html.erb
index 0a739d067..4b4f37bb4 100644
--- a/app/views/wiki_pages/show.html.erb
+++ b/app/views/wiki_pages/show.html.erb
@@ -12,10 +12,6 @@
         <% end %>
       </h1>
 
-      <% if params[:redirected_from].present? %>
-        <div class="hint redirected-from">Redirected from <%= link_to params[:redirected_from], show_or_new_wiki_pages_path(:title => params[:redirected_from], :no_redirect => true) %>.</div>
-      <% end %>
-
       <div id="wiki-page-body" class="prose">
         <%= format_text(@wiki_page.body) %>
 
diff --git a/app/views/wiki_pages/show_or_new.html.erb b/app/views/wiki_pages/show_or_new.html.erb
index 50fc736e6..c75c45a95 100644
--- a/app/views/wiki_pages/show_or_new.html.erb
+++ b/app/views/wiki_pages/show_or_new.html.erb
@@ -4,13 +4,8 @@
 
     <section id="content">
       <h1 id="wiki-page-title"><%= params[:title] %></h1>
-
-      <% if params[:redirected_from].present? %>
-        <div class="hint redirected-from">Redirected from <%= link_to params[:redirected_from], show_or_new_wiki_pages_path(:title => params[:redirected_from], :no_redirect => true) %>.</div>
-      <% end %>
-
-      <div class="ui-corner-all ui-state-highlight notice">
-        This wiki page does not yet exist. <%= link_to "Create a new wiki page", new_wiki_page_path(:wiki_page => {:title => params[:title]}) %>.
+      <div id="wiki-page-body" class="prose">
+        <p>This wiki page does not exist. <%= link_to "Create new wiki page", new_wiki_page_path(:wiki_page => {:title => params[:title]}) %>.</p>
       </div>
 
       <%= wiki_page_alias_and_implication_list(@wiki_page)%>