Merge branch 'dev' into 'dev'

Improve plink to share tag detection

See merge request hubzilla/core!1704

1 files changed, 14 insertions, 12 deletions

diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php
index 7d6ff4043..fcf8a6aa1 100644
--- a/Zotlabs/Module/Linkinfo.php
+++ b/Zotlabs/Module/Linkinfo.php
@@ -46,18 +46,20 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 	
 		logger('linkinfo: ' . $url);
 		
-        // Replace plink URL with 'share' tag if possible
-        if (preg_match("/mid=b64\.(\w+)(&.+)?$/", $url, $mid)) {
-            
-            $r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
-                dbesc(base64url_decode($mid[1])),
-                intval(local_channel())
-            );
-            if ($r) {
-                echo "[share=" . $r[0]['id'] . "][/share]";
-                killme();
-            }
-        }
+                // Replace plink URL with 'share' tag if possible
+                preg_match("/(mid=b64\.|display\/|posts\/)([\w\-]+)(&.+)?$/", $url, $mid);
+
+                if (!empty($mid) && $mid[1] == 'mid=b64.')
+                        $mid[2] = base64_decode($mid[2]);
+
+                $r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
+                        dbesc((empty($mid) ? $url : $mid[2])),
+                        intval(local_channel())
+                );
+                if ($r) {
+                        echo "[share=" . $r[0]['id'] . "][/share]";
+                        killme();
+                }
 
 		$result = z_fetch_url($url,false,0,array('novalidate' => true, 'nobody' => true));
 		if($result['success']) {