Browse Source

bypass D* markdown bug for now

pull/25/merge
friendica 11 years ago
parent
commit
a13156c0f3
  1. 2
      boot.php
  2. 8
      include/bb2diaspora.php
  3. 19
      js/main.js
  4. 2
      mod/item.php
  5. 3
      view/theme/duepuntozero/jot.tpl

2
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.1220' );
define ( 'FRIENDICA_VERSION', '2.3.1221' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1115 );

8
include/bb2diaspora.php

@ -94,8 +94,12 @@ function bb2diaspora($Text,$preserve_nl = false) {
// [img]pathtoimage[/img]
// $Text = preg_replace("/\[url\=([$URLSearchString]*)\]\[img\](.*?)\[\/img\]\[\/url\]/ism",
// '![' . t('image/photo') . '](' . '$2' . ')' . "\n" . '[' . t('link') . '](' . '$1' . ')', $Text);
// the following was added on 10-January-2012 due to an inability of Diaspora's
// new javascript markdown processor to handle links with images as the link "text"
// It is not optimal and may be removed if this ability is restored in the future
$Text = preg_replace("/\[url\=([$URLSearchString]*)\]\[img\](.*?)\[\/img\]\[\/url\]/ism",
'![' . t('image/photo') . '](' . '$2' . ')' . "\n" . '[' . t('link') . '](' . '$1' . ')', $Text);
$Text = preg_replace("/\[bookmark\]([$URLSearchString]*)\[\/bookmark\]/ism", '[$1]($1)', $Text);
$Text = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", '[$2]($1)', $Text);

19
js/main.js

@ -433,6 +433,25 @@
function preview_post() {
$("#jot-preview").val("1");
$("#jot-preview-content").show();
tinyMCE.triggerSave();
$.post(
"item",
$("#profile-jot-form").serialize(),
function(data) {
if(data.preview) {
$("#jot-preview-content").html(data.preview);
$("#jot-preview-content" + " a").removeAttr('href');
}
},
"json"
);
$("#jot-preview").val("1");
return true;
}
function unpause() {
// unpause auto reloads if they are currently stopped

2
mod/item.php

@ -38,6 +38,8 @@ function item_post(&$a) {
call_hooks('post_local_start', $_POST);
logger('postvars' . print_r($_POST,true));
$api_source = ((x($_POST,'api_source') && $_POST['api_source']) ? true : false);
$return_path = ((x($_POST,'return')) ? $_POST['return'] : '');

3
view/theme/duepuntozero/jot.tpl

@ -68,6 +68,9 @@
</div>
</div>
<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
<div id="jot-preview-content" style="display:none;"></div>
</div>
<div id="profile-jot-end"></div>

Loading…
Cancel
Save