Merge branch 'release/1.8.1'

2 files changed, 21 insertions, 1 deletions

diff --git a/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php b/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php
index cad2be345..b4882bb7f 100644
--- a/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php
+++ b/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php
@@ -3,6 +3,11 @@
  * Make the user set up some alternative ways to login.
  */
 
+echo '<div>';
+$site = get_config('site');
+echo elgg_echo('twitter_api:interstitial:description', array($site->name));
+echo '</div>';
+
 $user = elgg_get_logged_in_user_entity();
 
 if (elgg_is_sticky_form('twitter_api_interstitial')) {
@@ -51,7 +56,7 @@ echo elgg_view_module('info', $title, $body);
 // buttons
 
 echo elgg_view('input/submit', array(
-	'text' => elgg_echo('save')
+	'value' => elgg_echo('save')
 ));
 
 echo elgg_view('output/url', array(
diff --git a/mod/twitter_api/views/default/plugins/twitter_api/settings.php b/mod/twitter_api/views/default/plugins/twitter_api/settings.php
index 0b9afd4cf..3a3ec93a2 100644
--- a/mod/twitter_api/views/default/plugins/twitter_api/settings.php
+++ b/mod/twitter_api/views/default/plugins/twitter_api/settings.php
@@ -39,12 +39,27 @@ $new_users_with_twitter_view = elgg_view('input/dropdown', array(
 	'value' => $vars['entity']->new_users ? $vars['entity']->new_users : 'no',
 ));
 
+$post_to_twitter = '';
+if (elgg_is_active_plugin('thewire')) {
+	$post_to_twitter_string = elgg_echo('twitter_api:post_to_twitter');
+	$post_to_twitter_view = elgg_view('input/dropdown', array(
+		'name' => 'params[wire_posts]',
+		'options_values' => array(
+			'yes' => elgg_echo('option:yes'),
+			'no' => elgg_echo('option:no'),
+		),
+		'value' => $vars['entity']->wire_posts ? $vars['entity']->wire_posts : 'no',
+	));
+	$post_to_twitter = "<div>$post_to_twitter_string $post_to_twitter_view</div>";
+}
+
 $settings = <<<__HTML
 <div class="elgg-content-thin mtm"><p>$instructions</p></div>
 <div><label>$consumer_key_string</label><br /> $consumer_key_view</div>
 <div><label>$consumer_secret_string</label><br /> $consumer_secret_view</div>
 <div>$sign_on_with_twitter_string $sign_on_with_twitter_view</div>
 <div>$new_users_with_twitter $new_users_with_twitter_view</div>
+$post_to_twitter
 __HTML;
 
 echo $settings;