Changeset 669 for trunk/phpbms/include

Timestamp:

10/23/09 13:43:01 (3 years ago)

Author:

nate

Message:

• The mysql_pconnect option in the settings.php should be a boolean and not a string. The defaultsettings.php has been changed to show this.
• "preg" type functions that did not have boundary slashes (/) have been changed to have them.

Location:

trunk/phpbms/include

Files:

• common_functions.php (modified) (3 diffs)
• db.php (modified) (1 diff)

trunk/phpbms/include/common_functions.php

@@ -756 +756 @@
 
                         case "English, US":
-                                $datestring="/".preg_replace(",.","/",$datestring);
+                                $datestring="/".preg_replace("/,./","/",$datestring);
                                 $temparray=explode("/",$datestring);
                                 if(count($temparray)==4)
@@ -765 +765 @@
 
                         case "English, UK":
-                                $datestring="/".preg_replace(",.","/",$datestring);
+                                $datestring="/".preg_replace("/,./","/",$datestring);
                                 $temparray=explode("/",$datestring);
                                 if(count($temparray)==4)
@@ -774 +774 @@
 
                         case "Dutch, NL":
-                                $datestring="-".preg_replace(",.","-",$datestring);
+                                $datestring="-".preg_replace("/,./","-",$datestring);
                                 $temparray=explode("-",$datestring);
                                 if(count($temparray)==4)

trunk/phpbms/include/db.php

@@ -556 +556 @@
 
             // need to convert DOS or Mac line breaks
-            $line = preg_replace("\r\n$", "\n", $line);
-            $line = preg_replace("\r$", "\n", $line);
+            $line = preg_replace("/\r\n$/", "\n", $line);
+            $line = preg_replace("/\r$/", "\n", $line);
 
             // ignore comment lines, but only if they are not in quotes