aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xboot.php2
-rwxr-xr-xmod/oembed.php15
-rwxr-xr-xview/theme/duepuntozero/style.css1
3 files changed, 17 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index d04563d53..7a26dd9a2 100755
--- 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 );
diff --git a/mod/oembed.php b/mod/oembed.php
index 25995813a..236625f68 100755
--- a/mod/oembed.php
+++ b/mod/oembed.php
@@ -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();
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 66809a8d8..60fe4fb28 100755
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -824,6 +824,7 @@ input#dfrn-url {
.contact-entry-name {
float: left;
margin-left: 0px;
+ margin-right: 10px;
width: 120px;
overflow: hidden;
}