aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-18 19:15:01 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-18 19:15:01 -0700
commit6aa159e2ac09a03cdf52f17e0815a3ddc4cb9650 (patch)
treeee59150767d72547052aff088eeccec70c216193
parent2963be60e53916c9c6d579745695a54800876f82 (diff)
parent25e134dd9cb4768291517678286a197d5a4e79a6 (diff)
downloadvolse-hubzilla-6aa159e2ac09a03cdf52f17e0815a3ddc4cb9650.tar.gz
volse-hubzilla-6aa159e2ac09a03cdf52f17e0815a3ddc4cb9650.tar.bz2
volse-hubzilla-6aa159e2ac09a03cdf52f17e0815a3ddc4cb9650.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
-rw-r--r--include/bb2diaspora.php8
-rw-r--r--include/text.php8
-rw-r--r--mod/appman.php2
-rw-r--r--mod/apps.php2
-rw-r--r--version.inc2
5 files changed, 16 insertions, 6 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index fc82cb48c..692128087 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -413,10 +413,18 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
// Convert it to HTML - don't try oembed
$Text = bbcode($Text, $preserve_nl, false);
+ // Markdownify does not preserve previously escaped html entities such as <> and &.
+
+ $Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
+
// Now convert HTML to Markdown
$md = new Markdownify(false, false, false);
$Text = $md->parseString($Text);
+ // It also adds backslashes to our attempt at getting around the html entity preservation for some weird reason.
+
+ $Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('&lt;','&gt;','&amp;'),$Text);
+
// If the text going into bbcode() has a plain URL in it, i.e.
// with no [url] tags around it, it will come out of parseString()
// looking like: <http://url.com>, which gets removed by strip_tags().
diff --git a/include/text.php b/include/text.php
index 90ad57f62..377c1c46f 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1075,9 +1075,9 @@ function list_smilies() {
);
$icons = array(
- '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
- '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
- '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />',
+ '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" />',
+ '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;/3" />',
+ '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="&lt;\\3" />',
'<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
'<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
'<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
@@ -1186,7 +1186,7 @@ function preg_heart($x) {
$t = '';
for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
- $t .= '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />';
+ $t .= '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="&lt;3" />';
$r = str_replace($x[0],$t,$x[0]);
diff --git a/mod/appman.php b/mod/appman.php
index db22df883..e31492f0b 100644
--- a/mod/appman.php
+++ b/mod/appman.php
@@ -54,7 +54,7 @@ function appman_post(&$a) {
if($_SESSION['return_url'])
goaway(z_root() . '/' . $_SESSION['return_url']);
- goaway(z_root() . '/apps/personal');
+ goaway(z_root() . '/apps');
}
diff --git a/mod/apps.php b/mod/apps.php
index be9b54307..fcf545421 100644
--- a/mod/apps.php
+++ b/mod/apps.php
@@ -9,6 +9,8 @@ function apps_content(&$a) {
else
$mode = 'list';
+ $_SESSION['return_url'] = $a->cmd;
+
$apps = array();
$syslist = get_system_apps();
diff --git a/version.inc b/version.inc
index 4e53758a0..2b47a6bda 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-06-14.1063
+2015-06-18.1067