Changeset 5915 for trunk/calendar

Timestamp:

04/11/12 12:25:36 (12 years ago)

Author:

marcosw

Message:

Ticket #2398 - Compatibilizacao com PHP-5.3 em alguns módulos do expresso

File:

• trunk/calendar/csv_import.php (modified) (2 diffs)

trunk/calendar/csv_import.php

@@ -373 +373 @@
                                         foreach($trans[$csv_idx] as $pattern => $replace)
                                         {
-                                                if (preg_match((string) '/'.$pattern.'/',$val))
+                                                if (preg_match("/$pattern/",$val))
                                                 {
                                                         // echo "<p>csv_idx='$csv_idx',info='$info',trans_csv=".print_r($trans_csv).",ereg_replace('$pattern','$replace','$val') = ";
@@ -380 +380 @@
 
                                                         $reg = $CPreReg.'([a-zA-Z_0-9]+)'.$CPosReg;
-                                                        while (preg_match('/'.$reg.'/',$val,$vars))
+                                                        while (preg_match("/$reg/",$val,$vars))
                                                         {       // expand all CSV fields
                                                                 $val = str_replace($CPre.$vars[1].$CPos,$val[0] == '@' ? "'".addslashes($fields[array_search($vars[1],$csv_fields)])."'" : $fields[array_search($vars[1],$csv_fields)],$val);