X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fplaintext.php;h=cb56850d4f3cec833eacab9953527df603c3ac74;hb=885dc1df81c9ab752f9f5d66894786944184a9c9;hp=88febbfff858449fdec687cd35e6ac945e904eb0;hpb=910293729c55eb1d21e2fb7d9c9b8888e368135d;p=friendica.git

diff --git a/include/plaintext.php b/include/plaintext.php
index 88febbfff8..cb56850d4f 100644
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -52,12 +52,13 @@ function get_attached_data($body) {
 		if (preg_match_all("(\[url=([$URLSearchString]*)\]\s*\[img\]([$URLSearchString]*)\[\/img\]\s*\[\/url\])ism", $body, $pictures,  PREG_SET_ORDER)) {
 			if (count($pictures) == 1) {
 				// Checking, if the link goes to a picture
-				$data = parseurl_getsiteinfo($pictures[0][1], true);
+				$data = parseurl_getsiteinfo_cached($pictures[0][1], true);
 				if ($data["type"] == "photo") {
 					$post["type"] = "photo";
-					if (isset($data["images"][0]))
+					if (isset($data["images"][0])) {
 						$post["image"] = $data["images"][0]["src"];
-					else
+						$post["url"] = $data["url"];
+					} else
 						$post["image"] = $data["url"];
 
 					$post["preview"] = $pictures[0][2];
@@ -95,7 +96,7 @@ function get_attached_data($body) {
 		}
 	} elseif (isset($post["url"]) AND ($post["type"] == "video")) {
 		require_once("mod/parse_url.php");
-		$data = parseurl_getsiteinfo($post["url"], true);
+		$data = parseurl_getsiteinfo_cached($post["url"], true);
 
 		if (isset($data["images"][0]))
 			$post["image"] = $data["images"][0]["src"];
@@ -105,8 +106,8 @@ function get_attached_data($body) {
 }
 
 function shortenmsg($msg, $limit, $twitter = false) {
-	// To-Do:
-	// For Twitter URLs aren't shortened, but they have to be calculated as if.
+	/// @TODO
+	/// For Twitter URLs aren't shortened, but they have to be calculated as if.
 
 	$lines = explode("\n", $msg);
 	$msg = "";
@@ -182,6 +183,8 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2) {
 				$post["url"] = $b["plink"];
 			} elseif (strpos($b["body"], "[share") !== false)
 				$post["url"] = $b["plink"];
+			elseif (get_pconfig($b["uid"], "system", "no_intelligent_shortening"))
+				$post["url"] = $b["plink"];
 
 			$msg = shortenmsg($msg, $limit);
 		}