clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' 

Conflicts:
	twitter/twitter.php
This commit is contained in:
Michael Vogel 2013-01-05 16:41:00 +01:00
parent 7d3bf7144f 268c296f8b
commit cef923f104
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
twitter/twitter.php
View File

@ -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' ), ''),