From 809ee650ac9ef1dd704b5e3408dd271b196257b5 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Thu, 6 Feb 2014 07:29:02 -0800
Subject: [PATCH] Fix for glyph icon preview. Custom Menu automatically adds a
 SEF URL if missing.

---
 e107_admin/cpage.php | 12 ++++++++++--
 e107_admin/image.php |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index 5585adf6f..08bf830d1 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -587,11 +587,19 @@ class page_admin_ui extends e_admin_ui
 		
 		function beforeCreate($newdata,$olddata)
 		{
-			$newdata['menu_name'] = preg_replace('/[^\w-*]/','',$newdata['menu_name']);
+			$newdata['menu_name'] = preg_replace('/[^\w-*]/','-',$newdata['menu_name']);
 			
 			if(empty($newdata['page_sef']))
 			{
-				$newdata['page_sef'] = eHelper::title2sef($newdata['page_title']);
+				if(!empty($newdata['page_title']))
+				{
+					$newdata['page_sef'] = eHelper::title2sef($newdata['page_title']);
+				}
+				elseif(!empty($newdata['menu_name']))
+				{
+					$newdata['page_sef'] = eHelper::title2sef($newdata['menu_name']);
+				}
+		
 			}
 			else 
 			{
diff --git a/e107_admin/image.php b/e107_admin/image.php
index c83a4d66a..102fe704e 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -1279,7 +1279,7 @@ class media_admin_ui extends e_admin_ui
 		foreach($fa4 as $val)
 		{
 			$items[] = array( 
-					'previewUrl'	=> 'fa '.$val,
+					'previewUrl'	=> 'fa fa-'.$val,
 					'saveValue'		=> $val.'.glyph',
 					'thumbUrl'		=> $val,
 					'title'			=> $val,