Merge remote branch 'upstream/master'

This commit is contained in:
Michael Vogel 2012-06-17 09:13:25 +02:00
commit daed8c8720
22 changed files with 328 additions and 125 deletions

View file

@ -32,7 +32,7 @@ function tumblr_jot_nets(&$a,&$b) {
if(intval($tmbl_post) == 1) {
$tmbl_defpost = get_pconfig(local_user(),'tumblr','post_by_default');
$selected = ((intval($tmbl_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="tumblr_enable"' . $selected . 'value="1" /> '
$b .= '<div class="profile-jot-net"><input type="checkbox" name="tumblr_enable"' . $selected . ' value="1" /> '
. t('Post to Tumblr') . '</div>';
}
}