]> git.mxchange.org Git - friendica.git/commitdiff
fix link/bookmark reshares
authorfriendica <info@friendica.com>
Sun, 12 Feb 2012 03:21:41 +0000 (19:21 -0800)
committerfriendica <info@friendica.com>
Sun, 12 Feb 2012 03:21:41 +0000 (19:21 -0800)
boot.php
mod/oembed.php
view/theme/duepuntozero/style.css

index d04563d530b21377cf298b33c354a4f7d38a75f3..7a26dd9a24c84a6c6a68fbbca83497d23fd3d994 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1248' );
+define ( 'FRIENDICA_VERSION',      '2.3.1249' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1121      );
 
index 25995813a3316c26546eb3bc42b80c6485ae239c..236625f68a662ac23b1631b659bfb7e15f875f1e 100755 (executable)
@@ -2,11 +2,26 @@
 require_once("include/oembed.php");
 
 function oembed_content(&$a){
+       // logger('mod_oembed ' . $a->query_string, LOGGER_ALL);
+
+       if ($a->argv[1]=='b2h'){
+               $url = array( "", trim(hex2bin($_REQUEST['url'])));
+               echo oembed_replacecb($url);
+               killme();
+       }
+       
+       if ($a->argv[1]=='h2b'){
+               $text = trim(hex2bin($_REQUEST['text']));
+               echo oembed_html2bbcode($text);
+               killme();
+       }
+       
        if ($a->argc == 2){
                echo "<html><body>";
                $url = base64url_decode($a->argv[1]);
                $j = oembed_fetch_url($url);
                echo $j->html;
+//             logger('mod-oembed ' . $j->html, LOGGER_ALL);
                echo "</body></html>";
        }
        killme();
index 66809a8d817943ba05ceab881dfb00c756b330dd..60fe4fb2838bc849c30d5d7f3a97696566287aeb 100755 (executable)
@@ -824,6 +824,7 @@ input#dfrn-url {
 .contact-entry-name {
        float: left;
        margin-left: 0px;
+       margin-right: 10px;
        width: 120px;
        overflow: hidden;
 }