X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=4cd4e5f52d853933d73f3486486887e9b7b38b61;hb=599bc1eb0a01d292b41a064019b65e70e6d6e821;hp=ee1bf3c14c68742a8e78aeb0a64bcad7240dbc46;hpb=234598280d96627861a1ff1dcfc8a4a59bd37054;p=friendica.git
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index ee1bf3c14c..4cd4e5f52d 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,13 +1,15 @@
argc > 1) {
if(! x($_FILES,'media')) {
$nick = $a->argv[1];
- $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+ $r = q("SELECT `user`.*, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick)
);
@@ -16,7 +18,7 @@ function wall_upload_post(&$a) {
}
else {
$user_info = api_get_user($a);
- $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+ $r = q("SELECT `user`.*, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($user_info['screen_name'])
);
}
@@ -158,15 +160,14 @@ 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')))
+ if(local_user() && (! feature_enabled(local_user(),'richtext') || 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
+ }
+ else {
echo '
getExt()."\" alt=\"$basename\" />
";
- /*existing code*/
-
- } else {
+ }
+ }
+ 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);
}