resourceloader: Remove obsolete msg_resource database table

[lhc/web/wiklou.git] / includes / installer / PostgresUpdater.php

diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php
index 7414d92..7880557 100644 (file)
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -85,8 +85,6 @@ class PostgresUpdater extends DatabaseUpdater {
                        array( 'addTable', 'log_search', 'patch-log_search.sql' ),
                        array( 'addTable', 'l10n_cache', 'patch-l10n_cache.sql' ),
                        array( 'addTable', 'iwlinks', 'patch-iwlinks.sql' ),
-                       array( 'addTable', 'msg_resource', 'patch-msg_resource.sql' ),
-                       array( 'addTable', 'msg_resource_links', 'patch-msg_resource_links.sql' ),
                        array( 'addTable', 'module_deps', 'patch-module_deps.sql' ),
                        array( 'addTable', 'uploadstash', 'patch-uploadstash.sql' ),
                        array( 'addTable', 'user_former_groups', 'patch-user_former_groups.sql' ),
@@ -424,7 +422,11 @@ class PostgresUpdater extends DatabaseUpdater {
                        array( 'dropTable', 'hitcounter' ),
                        array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ),
                        array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ),
-                       array( 'dropFkey', 'recentchanges', 'rc_cur_id' )
+                       array( 'dropFkey', 'recentchanges', 'rc_cur_id' ),
+
+                       // 1.27
+                       array( 'dropTable', 'msg_resource_links' ),
+                       array( 'dropTable', 'msg_resource' ),
                );
        }
 
@@ -512,7 +514,8 @@ END;
                if ( !$res ) {
                        return null;
                }
-               if ( !( $r = $this->db->fetchRow( $res ) ) ) {
+               $r = $this->db->fetchRow( $res );
+               if ( !$r ) {
                        return null;
                }
 
@@ -532,7 +535,8 @@ END;
                        if ( !$r2 ) {
                                return null;
                        }
-                       if ( !( $row2 = $this->db->fetchRow( $r2 ) ) ) {
+                       $row2 = $this->db->fetchRow( $r2 );
+                       if ( !$row2 ) {
                                return null;
                        }
                        $colnames[] = $row2[0];
@@ -555,7 +559,8 @@ END;
                                $this->db->addQuotes( $fkey )
                        )
                );
-               if ( !( $row = $this->db->fetchRow( $r ) ) ) {
+               $row = $this->db->fetchRow( $r );
+               if ( !$row ) {
                        return null;
                }