From: Michael <heluecht@pirati.ca>
Date: Thu, 22 Mar 2018 20:47:31 +0000 (+0000)
Subject: No display improvements for regular posts
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dccfc83a2d0abc019939720fbc06266e4cf102f4;p=friendica.git

No display improvements for regular posts
---

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index b0d3a11faf..13d4e1b055 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -826,48 +826,6 @@ class BBCode
 		return sprintf($html, $url, $styled_url);
 	}
 
-	/**
-	 * @brief Shortens [url] BBCodes in a format that looks less ugly than the full address. (callback function)
-	 * @param array $match Array with the matching values
-	 * @return string reformatted link including HTML codes
-	 */
-	private static function shortenVisibleUrlCallback($match)
-	{
-		$url = $match[1];
-
-		if (isset($match[2]) && ($match[1] != $match[2])) {
-			return $match[0];
-		}
-
-		$parts = parse_url($url);
-		if (!isset($parts['scheme'])) {
-			return $match[0];
-		}
-
-		return self::shortenVisibleUrl($url);
-	}
-
-	/**
-	 * @brief Shortens [url] BBCodes in a format that looks less ugly than the full address.
-	 * @param string $url URL that is about to be reformatted
-	 * @return string reformatted link including HTML codes
-	 */
-	private static function shortenVisibleUrl($url)
-	{
-		$parts = parse_url($url);
-		$scheme = $parts['scheme'] . '://';
-		$styled_url = str_replace($scheme, '', $url);
-
-//		Currently deactivated, due to preview problems inside of Diaspora
-//		if (strlen($styled_url) > 30) {
-//			$styled_url = substr($styled_url, 0, 30) . "…";
-//		}
-
-		$html = '<a href="%s" target="_blank">%s</a>';
-
-		return sprintf($html, $url, $styled_url);
-	}
-
 	/*
 	 * [noparse][i]italic[/i][/noparse] turns into
 	 * [noparse][ i ]italic[ /i ][/noparse],
@@ -1496,9 +1454,6 @@ class BBCode
 			if ($simple_html == 7) {
 				$text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text);
 				$text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'self::convertUrlForOStatusCallback', $text);
-			} else {
-				$text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'self::shortenVisibleUrlCallback', $text);
-				$text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'self::shortenVisibleUrlCallback', $text);
 			}
 		} else {
 			$text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism", " $1 ", $text);