Merge branch 'master' of https://github.com/Spuds/playpen

Conflicts:
	Themes/default/scripts/script.js

Sources/ManageSettings.php

@@ -1729,7 +1729,12 @@ function EditCustomProfiles()
 
 		// Everyone needs a name - even the (bracket) unknown...
 		if (trim($_POST['field_name']) == '')
-			fatal_lang_error('custom_option_need_name');
+			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
+
+		// Regex you say?  Do a very basic test to see if the pattern is valid
+		if (isset($_POST['regex']) && (empty($_POST['regex']) || @preg_match($_POST['regex'], 'dummy') === false))
+			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
+			
 		$_POST['field_name'] = $smcFunc['htmlspecialchars']($_POST['field_name']);
 		$_POST['field_desc'] = $smcFunc['htmlspecialchars']($_POST['field_desc']);
 

Themes/default/Admin.template.php

@@ -1010,7 +1010,7 @@ function template_show_settings()
 function template_show_custom_profile()
 {
 	global $context, $txt, $settings, $scripturl;
-
+	
 	// Standard fields.
 	template_show_list('standard_profile_fields');
 
@@ -1031,11 +1031,22 @@ function template_edit_profile_field()
 {
 	global $context, $txt, $settings, $scripturl;
 
-	// All the javascript for this page - quite a bit!
+	// All the javascript for this page - quite a bit in script.js!
 	echo '
 	<script type="text/javascript"><!-- // --><![CDATA[
 		var startOptID = ', count($context['field']['options']), ';
 	// ]]></script>';
+	
+	// any errors messages to show?
+	if (isset($_GET['msg']))
+	{
+		loadLanguage('Errors');
+		if (isset($txt['custom_option_' . $_GET['msg']]))
+			echo '
+	<div class="errorbox">',
+		$txt['custom_option_' . $_GET['msg']], '
+	</div>';
+	}
 
 	echo '
 	<div id="admincenter">