no blocks larger than /16

[lhc/web/wiklou.git] / update.php

diff --git a/update.php b/update.php
index 5dac771..e4ae187 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 # Update already-installed software
 #
@@ -154,13 +154,29 @@ function update_passwords() {
 
 function do_ipblocks_update() {
        global $wgDatabase;
-       if ( $wgDatabase->fieldExists( "ipblocks", "ipb_id" ) ) {
-               echo "...ipblocks table is up to date.\n";
-       } else {
+
+       $do1 = $do2 = false;
+
+       if ( !$wgDatabase->fieldExists( "ipblocks", "ipb_id" ) ) {
+               $do1 = true;
+       }
+       if ( !$wgDatabase->fieldExists( "ipblocks", "ipb_expiry" ) ) {
+               $do2 = true;
+       }
+
+       if ( $do1 || $do2 ) {
                echo "Updating ipblocks table... ";
-               dbsource( "maintenance/archives/patch-ipblocks.sql", $wgDatabase );
+               if ( $do1 ) {
+                       dbsource( "maintenance/archives/patch-ipblocks.sql", $wgDatabase );
+               }
+               if ( $do2 ) {
+                       dbsource( "maintenance/archives/patch-ipb_expiry.sql", $wgDatabase );
+               }
                echo "ok\n";
+       } else {
+               echo "...ipblocks is up to date.\n";
        }
+       
 }