From 8bb0f08c6c5c16539c585b073ce0cdf3a32760de Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 3 Dec 2012 00:43:06 -0800
Subject: [PATCH] default to bbcode format when uploading photos, since default
editor is now plaintext
---
mod/wall_upload.php | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 17de7cceb7..6a6b894fbd 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -160,17 +160,9 @@ function wall_upload_post(&$a) {
//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')) || x($_REQUEST['nomce'])) ) {
- 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 {
+ 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 {
$m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
return($m);
}
--
2.39.5