diff options
| author | friendica <info@friendica.com> | 2012-02-22 22:36:07 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-22 22:36:07 -0800 |
| commit | 808b886a3e18b07c63171c4833334e2cf77ddf71 (patch) | |
| tree | ca88e82039b5b5c0ceafec9a6fffc369e3c852eb /mod/wall_upload.php | |
| parent | 9fe12d1724acf819f2cbc88bf6647e0adee0b5ea (diff) | |
| parent | 3c6b127d40e2f0ea1c2d8eb7114c3e121b58ba2e (diff) | |
| download | volse-hubzilla-808b886a3e18b07c63171c4833334e2cf77ddf71.tar.gz volse-hubzilla-808b886a3e18b07c63171c4833334e2cf77ddf71.tar.bz2 volse-hubzilla-808b886a3e18b07c63171c4833334e2cf77ddf71.zip | |
Merge branch 'master' into notify
Diffstat (limited to 'mod/wall_upload.php')
| -rwxr-xr-x | mod/wall_upload.php | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 278c21354..64f174a78 100755 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -101,10 +101,24 @@ function wall_upload_post(&$a) { $basename = basename($filename); - 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}.jpg[/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}.jpg\" alt=\"$basename\" /></a><br /><br />"; + +/* 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}.jpg[/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}.jpg\" alt=\"$basename\" /></a><br /><br />"; + /*existing code*/ + + } else { + $m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.jpg[/img][/url]"; + return($m); + } +/* mod Waitman Gobble NO WARRANTY */ killme(); // NOTREACHED |