From 2752b58f3323a15b964f6518b7720cb81ccf1b0e Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 5 Nov 2012 01:25:08 -0800 Subject: plaintext default - richtext is a feature --- mod/wall_upload.php | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'mod/wall_upload.php') diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 8abb7e5a7..c695f9b3e 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -155,23 +155,13 @@ function wall_upload_post(&$a) { $basename = basename($filename); -/* mod Waitman Gobble NO WARRANTY */ - -//if we get the signal then return the image url info in BBCODE, otherwise this outputs the info and bails (for the ajax image uploader on wall post) - if ($_REQUEST['hush']!='yeah') { - - /*existing code*/ - if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) - echo "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n"; - else - echo '

getExt()."\" alt=\"$basename\" />

"; - /*existing code*/ - - } else { + if($_REQUEST['silent']) { $m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]"; return($m); } -/* mod Waitman Gobble NO WARRANTY */ + else { + echo "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n"; + } killme(); // NOTREACHED -- cgit v1.2.3