From 212f612e3eb6fcbe64ebeec45205a88429b094be Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Fri, 21 Nov 2014 17:25:02 +0800
Subject: [PATCH] fixed uri parsing and also some page controller changes

---
 app/controllers/pages_controller.rb | 6 ++++--
 app/helpers/application_helper.rb   | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 62aa813..8fe3983 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -391,7 +391,8 @@ class PagesController < ApplicationController
     page = Page.find(params[:page][:parent_page])
     page.url = page.url == "/" ? "" : page.url
     @url = page.url + "/#{params[:page][:page_id]}"
-    p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [], menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: current_site.valid_locales,external_url_translations: current_site.valid_locales)
+    valid_locales = current_site.valid_locales rescue []
+    p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [], menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: valid_locales ,external_url_translations: valid_locales)
     p["url"] = @url
     if p["external_url_translations"]
       current_site.in_use_locales.each do |loc|
@@ -402,7 +403,8 @@ class PagesController < ApplicationController
   end
 
   def page_update_params
-    p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [],menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: current_site.valid_locales, external_url_translations: current_site.valid_locales)
+    valid_locales = current_site.valid_locales rescue []
+    p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [],menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: valid_locales, external_url_translations: valid_locales)
     p["role_status"] = p["role_status"] || []
     p["categories"] = p["categories"] || []
     p["enabled_for"] = p["enabled_for"] || []
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 18708ea..40c98c8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -478,6 +478,7 @@ module ApplicationHelper
   	end
 
   	def get_target(link)
+  		link = link.split("?").first
 		temp_url = URI.parse(link)
 		target = "_blank"
 		if temp_url.host.nil?