Changeset 311

Timestamp:

03/03/10 12:54:21 (11 years ago)

Author:

sander

Message:

More PHP 5.3 fixes

Location:

trunk/server/www

Files:

• app/plugins/bean_stalk/vendors/beanstalk-1.2.1/src/BeanStalk.class.php (modified) (3 diffs)
• cake/console/libs/tasks/extract.php (modified) (1 diff)
• cake/libs/flay.php (modified) (1 diff)
• cake/libs/l10n.php (modified) (1 diff)

trunk/server/www/app/plugins/bean_stalk/vendors/beanstalk-1.2.1/src/BeanStalk.class.php

@@ -98 +98 @@
         $this->select_mode = $in_connection_settings['select'];
         
-        $split = split(' ',$this->select_mode);
+        $split = explode(' ',$this->select_mode);
         $reserver = '_reserve_'.array_pop($split);
         $nextserver = implode(' ',$split);
@@ -591 +591 @@
     public function __construct($in_server_str, $in_conn_to, $in_conn_r, $in_auto_unyaml, $in_logfile)
     {
-        $server = split(':',$in_server_str);
+        $server = explode(':',$in_server_str);
         
         if (ip2long($server[0]) === false)
@@ -1315 +1315 @@
             return false;
             
-        return new BeanQueueJob(&$in_server, $in_job_id, $in_job_payload);
+        return new BeanQueueJob($in_server, $in_job_id, $in_job_payload);
     }
     

trunk/server/www/cake/console/libs/tasks/extract.php

@@ -264 +264 @@
 
                                 if (is_array($token)) {
-                                        $lineNumber += count(split("\n", $token[1])) - 1;
+                                        $lineNumber += count(explode("\n", $token[1])) - 1;
                                 } else {
-                                        $lineNumber += count(split("\n", $token)) - 1;
+                                        $lineNumber += count(explode("\n", $token)) - 1;
                                 }
                         }

trunk/server/www/cake/libs/flay.php

@@ -97 +97 @@
                 $out ='';
 
-                foreach (split('%PARAGRAPH%', $text)as $line) {
+                foreach (explode('%PARAGRAPH%', $text)as $line) {
                         if ($line) {
                                 if (!$bare) {

trunk/server/www/cake/libs/l10n.php

@@ -395 +395 @@
  */
         function __autoLanguage() {
-                $_detectableLanguages = split('[,;]', env('HTTP_ACCEPT_LANGUAGE'));
+                $_detectableLanguages = preg_split('/[,;]/', env('HTTP_ACCEPT_LANGUAGE'));
                 foreach ($_detectableLanguages as $key => $langKey) {
                         $langKey = strtolower($langKey);