Merge remote branch 'origin/master'

exponentcms · Mar 25, 2011 · 084afc1 · 084afc1
2 parents 746e51a + 695c2e2
commit 084afc1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/conf/extensions/site.structure.php b/conf/extensions/site.structure.php
@@ -21,6 +21,7 @@
 if (!defined('EXPONENT')) exit('');
 
 $i18n = exponent_lang_loadFile('conf/extensions/site.structure.php');
+$installed_editors = array();
 
 foreach (glob(BASE . "themes/common/editors/*.tpl") as $installed_glue_file) {
    $installed_editor = basename($installed_glue_file, ".tpl");

diff --git a/framework/modules/administration/views/administration/configure_site.tpl b/framework/modules/administration/views/administration/configure_site.tpl
@@ -71,7 +71,7 @@
                     {control type="text" name="sc[USER_REGISTRATION_ADMIN_EMAIL]" label="The email address that should be notified when a user signs up" value=$smarty.const.USER_REGISTRATION_ADMIN_EMAIL}
                     {control type="checkbox" postfalse=1 name="sc[USER_REGISTRATION_SEND_WELCOME]" label="Send an welcome email to the user after signing up?" checked=$smarty.const.USER_REGISTRATION_SEND_WELCOME value=1}
                     {control type="text" name="sc[USER_REGISTRATION_WELCOME_SUBJECT]" label="The subject of the Welcome Email to the user" value=$smarty.const.USER_REGISTRATION_WELCOME_SUBJECT}
-                    {control type="editor" name="sc[USER_REGISTRATION_WELCOME_MSG]" label="The content of the email sent to the user upon completing registration" value=$smarty.const.USER_REGISTRATION_WELCOME_MSG}
+                    {control type="textarea" name="sc[USER_REGISTRATION_WELCOME_MSG]" label="The content of the email sent to the user upon completing registration" value=$smarty.const.USER_REGISTRATION_WELCOME_MSG}
                 </div>
                 <div id="tab4">
                     {control type="checkbox" postfalse=1 name="sc[COMMENTS_REQUIRE_LOGIN]" label="Require Login to Post Comments" checked=$smarty.const.COMMENTS_REQUIRE_LOGIN value=1}

diff --git a/subsystems/config.php b/subsystems/config.php
@@ -85,8 +85,8 @@ function exponent_config_parseFile($file) {
 		if ($line != "" && substr($line,0,2) != "<?" && substr($line,-2,2) != "?>") {
 			$line = str_replace(array("<?php","?>","<?",),"",$line);
 
-			$opts = split("[\"'],",$line);
-
+//			$opts = split("[\"'],",$line);  // deprecated in php 5.3+
+			$opts = preg_split("/[\"'],/",$line);
 
 			if (count($opts) == 2) {
 				if (substr($opts[1],0,1) == '"' || substr($opts[1],0,1) == "'") 

diff --git a/subsystems/lang/eng_US/conf/extensions/antispam.structure.php b/subsystems/lang/eng_US/conf/extensions/antispam.structure.php
@@ -5,6 +5,7 @@
 
 	'antispam_control'=>'Choose an Anti-Spam Control',
 	'antispam_control_desc'=>'Spam on forms, like comments and contact forms can be a big issue for admins. If you would like to try to combat spam on your site, choose an anti-spam control to use.<br />',
+    'recaptcha_theme'=>'reCAPTCHA Theme.',
     'recaptcha_pub_key'=>'reCAPTCHA Public Key.',
     'recaptcha_pub_key_desc'=>'If you are using reCAPTCHA please enter the public key here.',
     'recaptcha_private_key'=>'reCAPTCHA Private Key.',