aboutsummaryrefslogtreecommitdiffstats
path: root/mod/wall_upload.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-11-05 01:25:08 -0800
committerfriendica <info@friendica.com>2012-11-05 01:25:08 -0800
commit2752b58f3323a15b964f6518b7720cb81ccf1b0e (patch)
tree6291006fdbe002d63adcca5a6c369457d10765e3 /mod/wall_upload.php
parent5f85f65dcc71c4fea12a2227b5773b991d19199f (diff)
downloadvolse-hubzilla-2752b58f3323a15b964f6518b7720cb81ccf1b0e.tar.gz
volse-hubzilla-2752b58f3323a15b964f6518b7720cb81ccf1b0e.tar.bz2
volse-hubzilla-2752b58f3323a15b964f6518b7720cb81ccf1b0e.zip
plaintext default - richtext is a feature
Diffstat (limited to 'mod/wall_upload.php')
-rw-r--r--mod/wall_upload.php18
1 files changed, 4 insertions, 14 deletions
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 '<br /><br /><a href="' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."\" alt=\"$basename\" /></a><br /><br />";
- /*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