Merge pull request #2761 from techAPJ/patch-2

FEATURE: hide google search on 404 page for private instance

app/controllers/exceptions_controller.rb

@@ -2,6 +2,8 @@ class ExceptionsController < ApplicationController
   skip_before_filter :check_xhr, :preload_json
 
   def not_found
+    @hide_google = true if SiteSetting.login_required
+
     # centralize all rendering of 404 into app controller
     raise Discourse::NotFound
   end