diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-15 01:02:44 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-15 01:02:44 -0400 |
| commit | 6e133e75c3ed12a4637d9cc946b1cb838619b9cc (patch) | |
| tree | 44eb74a6943ecc26a795f136e79d653c39955d63 /include/text.php | |
| parent | ebccf13c4c883e1438f4446d6aeba070ce6ee967 (diff) | |
| parent | b06c5983a4dae26dd24aecd7473bad98558cd6fc (diff) | |
| download | volse-hubzilla-6e133e75c3ed12a4637d9cc946b1cb838619b9cc.tar.gz volse-hubzilla-6e133e75c3ed12a4637d9cc946b1cb838619b9cc.tar.bz2 volse-hubzilla-6e133e75c3ed12a4637d9cc946b1cb838619b9cc.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
roll protocol version due to ssl_policy settings
force login to ssl on SSL_POLICY_SELFSIGN
basic ssl_policy for important modules
ssl_policy stuff
revup
splitted tests into several files
removed done TODO
get_tags tests corrected. They test for the right things now.
addon settings form error
more work on filer, comment level and file tag removal
added slack-NS, non-scrolly, slackr-based theme.
get tags test improved
splitted test cases.
changed a test string
added some tests
added library and include to .htaccess
excludes reports from git
better tests
added test blueprints, fixed? encoding issues
* master:
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/text.php b/include/text.php index c44b4d178..199460d2c 100644 --- a/include/text.php +++ b/include/text.php @@ -874,6 +874,7 @@ function link_compare($a,$b) { if(! function_exists('prepare_body')) { function prepare_body($item,$attach = false) { + $a = get_app(); call_hooks('prepare_body_init', $item); $s = prepare_text($item['body']); @@ -916,7 +917,7 @@ function prepare_body($item,$attach = false) { $matches = false; $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); if($cnt) { - logger('prepare_text: categories: ' . print_r($matches,true), LOGGER_DEBUG); +// logger('prepare_text: categories: ' . print_r($matches,true), LOGGER_DEBUG); foreach($matches as $mtch) { if(strlen($x)) $x .= ','; @@ -931,11 +932,11 @@ function prepare_body($item,$attach = false) { $x = ''; $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); if($cnt) { - logger('prepare_text: filed_under: ' . print_r($matches,true), LOGGER_DEBUG); +// logger('prepare_text: filed_under: ' . print_r($matches,true), LOGGER_DEBUG); foreach($matches as $mtch) { if(strlen($x)) - $x .= ','; - $x .= file_tag_decode($mtch[1]); + $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>'; } if(strlen($x) && (local_user() == $item['uid'])) $s .= '<div class="filesavetags"><span>' . t('Filed under:') . ' </span>' . $x . '</div>'; |