using index.php and redirect.php instead of wiki.phtml and redirect.phtml

[lhc/web/wiklou.git] / maintenance / InitialiseMessages.inc

diff --git a/maintenance/InitialiseMessages.inc b/maintenance/InitialiseMessages.inc
index 6da89df..d731370 100755 (executable)
--- a/maintenance/InitialiseMessages.inc
+++ b/maintenance/InitialiseMessages.inc
@@ -111,11 +111,16 @@ function initialiseMessages( $overwrite = false) {
        }
        print "Done\n";
        print "Writing...";
+<<<<<<< InitialiseMessages.inc
+       print $sql;
+       wfQuery( $sql, DB_WRITE, $fname );
+=======
 
        if ( !$first ) {
                wfQuery( $sql, DB_WRITE, $fname );
        }
 
+>>>>>>> 1.7
        print "Done\n";
 
        $navText .= "</table>";