From 8d95864a7c05fbfb6981fbaf859a4d50ddcfd93f Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Fri, 25 Jun 2010 13:22:24 -0500
Subject: [PATCH] move upgrade to correct script

---
 docs/upgrades/upgrade_7.9.6-7.9.7.pl | 13 -------------
 docs/upgrades/upgrade_7.9.7-7.9.8.pl | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/docs/upgrades/upgrade_7.9.6-7.9.7.pl b/docs/upgrades/upgrade_7.9.6-7.9.7.pl
index 919693099..ea35f7b0a 100644
--- a/docs/upgrades/upgrade_7.9.6-7.9.7.pl
+++ b/docs/upgrades/upgrade_7.9.6-7.9.7.pl
@@ -51,19 +51,6 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
-#----------------------------------------------------------------------------
-# Add twitter auth and macro
-sub addTwitterAuth {
-    my $session = shift;
-    print "\tAdding twitter auth method... " unless $quiet;
-
-    $session->config->addToArray( 'authMethods', 'Twitter' );
-    $session->config->addToHash( 'macros', "TwitterLogin" => "TwitterLogin" );
-    $session->setting->set( 'twitterEnabled', 0 );
-
-    print "DONE!\n" unless $quiet;
-}
-
 #----------------------------------------------------------------------------
 # Describe what our function does
 sub cleanup_inbox_messageStateTable {
diff --git a/docs/upgrades/upgrade_7.9.7-7.9.8.pl b/docs/upgrades/upgrade_7.9.7-7.9.8.pl
index b5cea7794..04e8ae855 100644
--- a/docs/upgrades/upgrade_7.9.7-7.9.8.pl
+++ b/docs/upgrades/upgrade_7.9.7-7.9.8.pl
@@ -35,6 +35,7 @@ my $session = start(); # this line required
 changeFirstDayOfWeekDefault($session);
 updateLastPostCS($session);
 updateLastPostThread($session);
+addTwitterAuth( $session );
 
 finish($session); # this line required
 
@@ -48,6 +49,19 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+#----------------------------------------------------------------------------
+# Add twitter auth and macro
+sub addTwitterAuth {
+    my $session = shift;
+    print "\tAdding twitter auth method... " unless $quiet;
+
+    $session->config->addToArray( 'authMethods', 'Twitter' );
+    $session->config->addToHash( 'macros', "TwitterLogin" => "TwitterLogin" );
+    $session->setting->set( 'twitterEnabled', 0 );
+
+    print "DONE!\n" unless $quiet;
+}
+
 #----------------------------------------------------------------------------
 # Describe what our function does
 sub changeFirstDayOfWeekDefault {