Merge remote-tracking branch 'upstream/master'

Conflicts:
	twitter/twitter.php

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 26c684f142d161e4de3160959240b944bdfd661b..aeacb5b297d54486267fe97a712f409e46d1643f 100755 (executable)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -550,12 +550,7 @@ function twitter_plugin_admin_post(&$a){
 function twitter_plugin_admin(&$a, &$o){
        $t = get_markup_template( "admin.tpl", "addon/twitter/" );
 
-       $includes = array(
-               '$field_input' => 'field_input.tpl',
-       );
-       //$includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o = replace_macros($t, $includes + array(
+       $o = replace_macros($t, array(
                '$submit' => t('Submit'),
                                                                // name, label, value, help, [extra values]
                '$consumerkey' => array('consumerkey', t('Consumer key'),  get_config('twitter', 'consumerkey' ), ''),