Merge "Addition of a parser test for page= parameter of image inclusion"

[lhc/web/wiklou.git] / maintenance / cdb.php

diff --git a/maintenance/cdb.php b/maintenance/cdb.php
index bda64f3..86c686b 100644 (file)
--- a/maintenance/cdb.php
+++ b/maintenance/cdb.php
@@ -52,7 +52,7 @@ do {
        $bad = false;
        $showhelp = false;
        $quit = false;
-       static $fileHandle;
+       static $fileHandle = false;
 
        $line = Maintenance::readconsole();
        if ( $line === false ) {
@@ -77,7 +77,8 @@ do {
                        print "Loading cdb file $file...";
                        try {
                                $fileHandle = CdbReader::open( $file );
-                       } catch( CdbException $e ) {}
+                       } catch ( CdbException $e ) {
+                       }
 
                        if ( !$fileHandle ) {
                                print "not a cdb file or unable to read it\n";
@@ -98,6 +99,7 @@ do {
                                $res = $fileHandle->get( $args[0] );
                        } catch ( CdbException $e ) {
                                print "Unable to read key from file\n";
+                               break;
                        }
                        if ( $res === false ) {
                                print "No such key/value pair\n";