The branch, QA_3_3 has been updated via b2616ac46ddbc72ee3a03f13ee4d4ec746518274 (commit) from 20d4c3a894a70850b9bcac57a3d63af68d40ec2e (commit)
- Log ----------------------------------------------------------------- commit b2616ac46ddbc72ee3a03f13ee4d4ec746518274 Author: Marc Delisle marc@infomarc.info Date: Sat Jul 10 08:01:07 2010 -0400
bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?)
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 2 ++ libraries/auth/swekey/swekey.auth.lib.php | 2 +- libraries/import/csv.php | 2 +- libraries/import/ldi.php | 2 +- server_synchronize.php | 8 ++++---- 5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 205dd32..fc0822b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3024344 [setup] Setup forces numeric MemoryLimit - bug #3025975 [auth] Odd LoginCookieValidity default value - bug #3026400 [PHP] ereg functions are deprecated +- bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from +master, todo: update PHP excel?)
3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index f1e7c58..3dbad75 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -21,7 +21,7 @@ function Swekey_auth_check() if ($_SESSION['SWEKEY']['ENABLED'] && empty($_SESSION['SWEKEY']['CONF_LOADED'])) { $_SESSION['SWEKEY']['CONF_LOADED'] = true; $_SESSION['SWEKEY']['VALID_SWEKEYS'] = array(); - $valid_swekeys = split("\n",@file_get_contents($confFile)); + $valid_swekeys = explode("\n",@file_get_contents($confFile)); foreach ($valid_swekeys as $line) { if (preg_match("/^[0-9A-F]{32}:.+$/", $line) != false) { diff --git a/libraries/import/csv.php b/libraries/import/csv.php index f7ab3ed..193a6e1 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -101,7 +101,7 @@ if (!$analyze) { } else { $sql_template .= ' ('; $fields = array(); - $tmp = split(',( ?)', $csv_columns); + $tmp = preg_split('/,( ?)/', $csv_columns); foreach ($tmp as $key => $val) { if (count($fields) > 0) { $sql_template .= ', '; diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index 77ba0c1..f939a2d 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -90,7 +90,7 @@ if ($skip_queries > 0) { } if (strlen($ldi_columns) > 0) { $sql .= ' ('; - $tmp = split(',( ?)', $ldi_columns); + $tmp = preg_split('/,( ?)/', $ldi_columns); $cnt_tmp = count($tmp); for ($i = 0; $i < $cnt_tmp; $i++) { if ($i > 0) { diff --git a/server_synchronize.php b/server_synchronize.php index 8e4a701..a3c3266 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -535,20 +535,20 @@ if (isset($_REQUEST['Table_ids'])) {
for ($i = 0; isset($_REQUEST[$i]); $i++ ) { if (isset($_REQUEST[$i])) { - $table_id = split("US", $_REQUEST[$i]); + $table_id = explode("US", $_REQUEST[$i]); if (isset($table_id[1])) { $uncommon_table_structure_diff[] = $table_id[1]; } - $table_id = split("UD", $_REQUEST[$i]); + $table_id = explode("UD", $_REQUEST[$i]); if (isset($table_id[1])) { $uncommon_table_data_diff[] = $table_id[1]; } - $table_id = split("MS", $_REQUEST[$i]); + $table_id = explode("MS", $_REQUEST[$i]); if (isset($table_id[1])) { $matching_table_structure_diff[] = $table_id[1]; }
- $table_id = split("MD", $_REQUEST[$i]); + $table_id = explode("MD", $_REQUEST[$i]); if (isset($table_id[1])) { $matching_table_data_diff[] = $table_id[1]; }
hooks/post-receive
-
Marc Delisle