nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?)

Browse Source
This commit is contained in:
Marc Delisle
2010-07-10 08:01:07 -04:00
parent 20d4c3a894
commit b2616ac46d
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -15,6 +15,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #3024344 [setup] Setup forces numeric MemoryLimit - bug #3024344 [setup] Setup forces numeric MemoryLimit
- bug #3025975 [auth] Odd LoginCookieValidity default value - bug #3025975 [auth] Odd LoginCookieValidity default value
- bug #3026400 [PHP] ereg functions are deprecated - 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) 3.3.4.0 (2010-06-28)
- bug #2996161 [import] properly escape import value - bug #2996161 [import] properly escape import value

2
libraries/auth/swekey/swekey.auth.lib.php
View File

@@ -21,7 +21,7 @@ function Swekey_auth_check()
if ($_SESSION['SWEKEY']['ENABLED'] && empty($_SESSION['SWEKEY']['CONF_LOADED'])) { if ($_SESSION['SWEKEY']['ENABLED'] && empty($_SESSION['SWEKEY']['CONF_LOADED'])) {
$_SESSION['SWEKEY']['CONF_LOADED'] = true; $_SESSION['SWEKEY']['CONF_LOADED'] = true;
$_SESSION['SWEKEY']['VALID_SWEKEYS'] = array(); $_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) { foreach ($valid_swekeys as $line) {
if (preg_match("/^[0-9A-F]{32}:.+$/", $line) != false) if (preg_match("/^[0-9A-F]{32}:.+$/", $line) != false)
{ {

2
libraries/import/csv.php
View File

@@ -101,7 +101,7 @@ if (!$analyze) {
} else { } else {
$sql_template .= ' ('; $sql_template .= ' (';
$fields = array(); $fields = array();
$tmp = split(',( ?)', $csv_columns); $tmp = preg_split('/,( ?)/', $csv_columns);
foreach ($tmp as $key => $val) { foreach ($tmp as $key => $val) {
if (count($fields) > 0) { if (count($fields) > 0) {
$sql_template .= ', '; $sql_template .= ', ';

2
libraries/import/ldi.php
View File

@@ -90,7 +90,7 @@ if ($skip_queries > 0) {
} }
if (strlen($ldi_columns) > 0) { if (strlen($ldi_columns) > 0) {
$sql .= ' ('; $sql .= ' (';
$tmp = split(',( ?)', $ldi_columns); $tmp = preg_split('/,( ?)/', $ldi_columns);
$cnt_tmp = count($tmp); $cnt_tmp = count($tmp);
for ($i = 0; $i < $cnt_tmp; $i++) { for ($i = 0; $i < $cnt_tmp; $i++) {
if ($i > 0) { if ($i > 0) {

8
server_synchronize.php
View File

@@ -535,20 +535,20 @@ if (isset($_REQUEST['Table_ids'])) {
for ($i = 0; isset($_REQUEST[$i]); $i++ ) { for ($i = 0; isset($_REQUEST[$i]); $i++ ) {
if (isset($_REQUEST[$i])) { if (isset($_REQUEST[$i])) {
$table_id = split("US", $_REQUEST[$i]); $table_id = explode("US", $_REQUEST[$i]);
if (isset($table_id[1])) { if (isset($table_id[1])) {
$uncommon_table_structure_diff[] = $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])) { if (isset($table_id[1])) {
$uncommon_table_data_diff[] = $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])) { if (isset($table_id[1])) {
$matching_table_structure_diff[] = $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])) { if (isset($table_id[1])) {
$matching_table_data_diff[] = $table_id[1]; $matching_table_data_diff[] = $table_id[1];
} }