Merge remote-tracking branch 'origin/master'

phpmyadmin · Apr 6, 2012 · dba2c77 · dba2c77
2 parents acc576f + 337f39e
commit dba2c77
Show file tree

Hide file tree

Showing 71 changed files with 15,241 additions and 15,246 deletions.
diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php
@@ -283,10 +283,10 @@ function parseRulesFile()
                     $ruleLine = 1;
                     $j++;
                     $rules[$j] = array( 'name' => $match[1]);
-                    $lines[$j] = array( 'name' => $i);
+                    $lines[$j] = array( 'name' => $i + 1);
                     if (isset($match[3])) {
                         $rules[$j]['precondition'] = $match[3];
-                        $lines[$j]['precondition'] = $i;
+                        $lines[$j]['precondition'] = $i + 1;
                     }
                 } else {
                     $errors[] = 'Invalid rule declaration on line '.($i+1);
@@ -310,7 +310,7 @@ function parseRulesFile()
                     continue;
                 }
                 $rules[$j][$ruleSyntax[$ruleLine]] = chop(substr($line, 1));
-                $lines[$j][$ruleSyntax[$ruleLine]] = $i;
+                $lines[$j][$ruleSyntax[$ruleLine]] = $i + 1;
                 $ruleLine += 1;
             }