aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-04 16:02:12 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-04 16:02:12 -0700
commit5344431fc07e03d84a1e0c2ff7fb3e4c4d731cfe (patch)
tree04e677aa47e531e1b2da996a6a1901d7c3913b7d
parentf594a7776c37bfe6f1f07e259188d9de7057e189 (diff)
parenta61fc00fa495e144fbfadb354b7b82c3abc4b721 (diff)
downloadvolse-hubzilla-5344431fc07e03d84a1e0c2ff7fb3e4c4d731cfe.tar.gz
volse-hubzilla-5344431fc07e03d84a1e0c2ff7fb3e4c4d731cfe.tar.bz2
volse-hubzilla-5344431fc07e03d84a1e0c2ff7fb3e4c4d731cfe.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
-rwxr-xr-xinclude/items.php3
-rw-r--r--version.inc2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index e6ab52239..14b85c92e 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3380,6 +3380,9 @@ function post_is_importable($item,$abook) {
return true;
require_once('include/html2plain.php');
+
+ unobscure($item);
+
$text = prepare_text($item['body'],$item['mimetype']);
$text = html2plain($text);
diff --git a/version.inc b/version.inc
index 576ce2840..ce6a0da88 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-08-03.1113
+2015-08-04.1114