aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-12 17:47:38 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-12 17:47:38 -0800
commit888bf76e4b4c2d4285c0bb28334df6e9af884e16 (patch)
tree6ec874a975ffad844dd2389979f75939771518ed /include
parent22a650ade8b6c4472f9ad70337b69ee54e2c7c32 (diff)
downloadvolse-hubzilla-888bf76e4b4c2d4285c0bb28334df6e9af884e16.tar.gz
volse-hubzilla-888bf76e4b4c2d4285c0bb28334df6e9af884e16.tar.bz2
volse-hubzilla-888bf76e4b4c2d4285c0bb28334df6e9af884e16.zip
allow pdl content
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php5
-rw-r--r--include/text.php10
2 files changed, 14 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index c278dcf12..a7d5f3fa5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1089,6 +1089,11 @@ function format_like($cnt, $arr, $type, $id) {
return $o;
}
+/**
+ * This is our general purpose content editor.
+ * It was once nicknamed "jot" and you may see references to "jot" littered throughout the code.
+ * They are referring to the content editor or components thereof.
+ */
function status_editor($a, $x, $popup = false) {
diff --git a/include/text.php b/include/text.php
index edaa8dcd3..ed0e21a71 100644
--- a/include/text.php
+++ b/include/text.php
@@ -94,6 +94,8 @@ function z_input_filter($channel_id,$s,$type = 'text/bbcode') {
return escape_tags($s);
if($type == 'text/plain')
return escape_tags($s);
+ if($type == 'application/x-pdl')
+ return escape_tags($s);
$a = get_app();
if($a->is_sys) {
@@ -1517,6 +1519,11 @@ function prepare_text($text, $content_type = 'text/bbcode', $cache = false) {
$s = Markdown($text);
break;
+
+ case 'application/x-pdl';
+ $s = escape_tags($text);
+ break;
+
// No security checking is done here at display time - so we need to verify
// that the author is allowed to use PHP before storing. We also cannot allow
// importation of PHP text bodies from other sites. Therefore this content
@@ -1681,7 +1688,8 @@ function mimetype_select($channel_id, $current = 'text/bbcode') {
'text/bbcode',
'text/html',
'text/markdown',
- 'text/plain'
+ 'text/plain',
+ 'application/x-pdl'
);
$a = get_app();