From eddddf04b141b39b60fcaba5074978634f084bfa Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Mon, 14 Feb 2011 22:40:08 -0700
Subject: [PATCH 1/2] Restored reset_default_tweet(), without it the default
 tweet value isn't set during installation.

---
 3.1/modules/twitter/controllers/admin_twitter.php | 9 +--------
 3.1/modules/twitter/helpers/twitter.php           | 4 ++++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/3.1/modules/twitter/controllers/admin_twitter.php b/3.1/modules/twitter/controllers/admin_twitter.php
index a65168fb..5c954953 100644
--- a/3.1/modules/twitter/controllers/admin_twitter.php
+++ b/3.1/modules/twitter/controllers/admin_twitter.php
@@ -19,13 +19,6 @@
  */
 class Admin_Twitter_Controller extends Admin_Controller {
 
-  public $default_tweet;
-
-  function  __construct() {
-    parent::__construct();
-    $this->default_tweet = t("Check out this %type, '%title': %description %url");
-  }
-
   /**
    * bit.ly module's settings
    * @todo Show default tweet value after resetting it!
@@ -40,7 +33,7 @@ class Admin_Twitter_Controller extends Admin_Controller {
         $reset_tweet = $form->twitter_message->reset_tweet->value;
         if ($reset_tweet) {
           $default_tweet = $this->default_tweet;
-          $form->twitter_message->default_tweet->value = $this->default_tweet;
+          $form->twitter_message->default_tweet->value = twitter::reset_default_tweet();
         } else {
           $default_tweet = $form->twitter_message->default_tweet->value;
         }
diff --git a/3.1/modules/twitter/helpers/twitter.php b/3.1/modules/twitter/helpers/twitter.php
index 54df4e67..ceea12f5 100644
--- a/3.1/modules/twitter/helpers/twitter.php
+++ b/3.1/modules/twitter/helpers/twitter.php
@@ -133,4 +133,8 @@ class twitter_Core {
     }
   }
 
+  static function reset_default_tweet() {
+    return t("Check out this %type, '%title': %description %url");
+  }
+
 }

From 6e605a809535050de2554dd2f037820c902d63a1 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Mon, 14 Feb 2011 22:52:22 -0700
Subject: [PATCH 2/2] Redirect after updating settings.

---
 3.1/modules/twitter/controllers/admin_twitter.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/3.1/modules/twitter/controllers/admin_twitter.php b/3.1/modules/twitter/controllers/admin_twitter.php
index 5c954953..7d1400ab 100644
--- a/3.1/modules/twitter/controllers/admin_twitter.php
+++ b/3.1/modules/twitter/controllers/admin_twitter.php
@@ -32,8 +32,7 @@ class Admin_Twitter_Controller extends Admin_Controller {
         $consumer_secret = $form->twitter_oauth->consumer_secret->value;
         $reset_tweet = $form->twitter_message->reset_tweet->value;
         if ($reset_tweet) {
-          $default_tweet = $this->default_tweet;
-          $form->twitter_message->default_tweet->value = twitter::reset_default_tweet();
+          $default_tweet = twitter::reset_default_tweet();
         } else {
           $default_tweet = $form->twitter_message->default_tweet->value;
         }
@@ -43,7 +42,9 @@ class Admin_Twitter_Controller extends Admin_Controller {
         module::set_var("twitter", "consumer_secret", $consumer_secret);
         module::set_var("twitter", "default_tweet", $default_tweet);
         module::set_var("twitter", "shorten_urls", $shorten_urls);
+        
         message::success("Twitter settings saved");
+        url::redirect("admin/twitter");
       }
     }
     $is_registered = twitter::is_registered();