Merge remote-tracking branch 'origin/master'

2013-05-29 15:05:50 +02:00 · 2013-05-29 15:05:50 +02:00 · 0340be1d47
commit 0340be1d47
parent c56fae9245 15a40a07bf
1 changed files with 1 additions and 1 deletions
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@ -4109,7 +4109,7 @@ class PMA_Util
     *
     * @return String Matching regular expression.
     */
-    public static function getFirstOccuringRegularExpression($regex_array, $query)
+    public static function getFirstOccurringRegularExpression($regex_array, $query)
    {
        $minimum_first_occurance_index = null;
        $regex = null;