diff options
| -rw-r--r-- | libraries/database_interface.lib.php | 10 | ||||
| -rw-r--r-- | tbl_export.php | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index e224113ee9..56c4766ae9 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -2108,20 +2108,20 @@ function PMA_is_system_schema($schema_name, $test_for_mysql_schema = false) * * @return String Matching regular expression. */ -function PMA_getFirstOccuringRegularExpression($regex_array, $query) +function PMA_getFirstOccurringRegularExpression($regex_array, $query) { - $minimum_first_occurance_index = null; + $minimum_first_occurence_index = null; $regex = null; for ($i=0; $i<count($regex_array); $i++) { if (preg_match($regex_array[$i], $query, $matches, PREG_OFFSET_CAPTURE)) { - if (is_null($minimum_first_occurance_index) - || ($matches[0][1] < $minimum_first_occurance_index) + if (is_null($minimum_first_occurence_index) + || ($matches[0][1] < $minimum_first_occurence_index) ) { $regex = $regex_array[$i]; - $minimum_first_occurance_index = $matches[0][1]; + $minimum_first_occurence_index = $matches[0][1]; } } diff --git a/tbl_export.php b/tbl_export.php index aa4880b9e0..a89217dd32 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -43,7 +43,7 @@ if (! empty($sql_query)) { '/\bwhere\b/i', '/\bgroup by\b/i', '/\bhaving\b/i', '/\border by\b/i' ); - $first_occuring_regex = PMA_getFirstOccuringRegularExpression( + $first_occurring_regex = PMA_getFirstOccurringRegularExpression( $regex_array, $sql_query ); @@ -52,8 +52,8 @@ if (! empty($sql_query)) { // the result set from a query such as // "SELECT `id`, `name` FROM `customers` WHERE id NOT IN // ( SELECT id FROM companies WHERE name LIKE '%u%')" - if (! is_null($first_occuring_regex)) { - $temp_sql_array = preg_split($first_occuring_regex, $sql_query); + if (! is_null($first_occurring_regex)) { + $temp_sql_array = preg_split($first_occurring_regex, $sql_query); $sql_query = $temp_sql_array[0]; } |