diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-01 14:11:37 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-01 14:11:37 +0200 |
| commit | 7d23149a61f75923b2c71a288a722ee219f5e6ba (patch) | |
| tree | dea64e1cfc15eb6f95e7440e532258dfb909c21c /include/text.php | |
| parent | 59b45f7fc12027c387f04a2121ea398c1d534626 (diff) | |
| parent | bb67ca9f1c61f96db6da15aee646a20c0b77a255 (diff) | |
| download | volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.gz volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.bz2 volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/text.php b/include/text.php index 6d557ed84..191f4fca8 100644 --- a/include/text.php +++ b/include/text.php @@ -205,7 +205,6 @@ function hex2bin($s) { return ''; if(! ctype_xdigit($s)) { - logger('hex2bin: illegal input: ' . print_r(debug_backtrace(), true)); return($s); } @@ -610,6 +609,8 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { $url = $redirect_url; $sparkle = ' sparkle'; } + else + $url = zrl($url); } $click = ((x($contact,'click')) ? ' onclick="' . $contact['click'] . '" ' : ''); if($click) @@ -919,7 +920,7 @@ function prepare_body($item,$attach = false) { foreach($matches as $mtch) { if(strlen($x)) $x .= ','; - $x .= file_tag_decode($mtch[1]); + $x .= xmlify(file_tag_decode($mtch[1])); } if(strlen($x)) $s .= '<div class="categorytags"><span>' . t('Categories:') . ' </span>' . $x . '</div>'; @@ -934,7 +935,7 @@ function prepare_body($item,$attach = false) { foreach($matches as $mtch) { if(strlen($x)) $x .= ' '; - $x .= file_tag_decode($mtch[1]). ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . file_tag_decode($mtch[1]) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>'; + $x .= xmlify(file_tag_decode($mtch[1])) . ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>'; } if(strlen($x) && (local_user() == $item['uid'])) $s .= '<div class="filesavetags"><span>' . t('Filed under:') . ' </span>' . $x . '</div>'; @@ -1305,10 +1306,11 @@ function file_tag_decode($s) { } function file_tag_file_query($table,$s,$type = 'file') { + if($type == 'file') - $str = preg_quote( '[' . file_tag_encode($s) . ']' ); + $str = preg_quote( '[' . str_replace('%','%%',file_tag_encode($s)) . ']' ); else - $str = preg_quote( '<' . file_tag_encode($s) . '>' ); + $str = preg_quote( '<' . str_replace('%','%%',file_tag_encode($s)) . '>' ); return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' "; } |