Fixed bug #13775: Missing <tr> in "Admin Tools -> User Admin" (thanks to Stephan...
[Packages/TYPO3.CMS.git] / typo3 / wizard_forms.php
old mode 100755 (executable)
new mode 100644 (file)
index d19f024..1839860
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2008 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2009 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -400,9 +400,8 @@ class SC_wizard_forms {
                                $row = t3lib_BEfunc::getRecord($this->P['table'],$this->P['uid']);
 
                                        // If the save/close button was pressed, then redirect the screen:
-                               if ($_POST['saveandclosedok_x'])        {
-                                       header('Location: '.t3lib_div::locationHeaderUrl($this->P['returnUrl']));
-                                       exit;
+                               if ($_POST['saveandclosedok_x']) {
+                                       t3lib_utility_Http::redirect($this->P['returnUrl']);
                                }
                        }
                } else {        // If nothing has been submitted, load the $bodyText variable from the selected database row:
@@ -811,7 +810,7 @@ class SC_wizard_forms {
                                }
 
                                        // Compile the final line:
-                               $inLines[]=ereg_replace("[\n\r]*",'',implode(' | ',$thisLine));
+                               $inLines[]=preg_replace("/[\n\r]*/",'',implode(' | ',$thisLine));
                        }
                }
                        // Finally, implode the lines into a string, and return it:
@@ -857,7 +856,7 @@ class SC_wizard_forms {
 
                                if ($confData['type'])  {
                                        if (count($typeParts)==1)       {
-                                               $confData['fieldname'] = substr(ereg_replace('[^a-zA-Z0-9_]','',str_replace(' ','_',trim($parts[0]))),0,30);
+                                               $confData['fieldname'] = substr(preg_replace('/[^a-zA-Z0-9_]/','',str_replace(' ','_',trim($parts[0]))),0,30);
 
                                                        // Attachment names...
                                                if ($confData['type']=='file')  {