aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-09-28 19:31:19 -0700
committerhabeascodice <habeascodice@federated.social>2014-09-28 19:31:19 -0700
commit73ebdff0837a713d8849b713d0cc2fb4701a2c5f (patch)
tree7656a07d3eb8d87d12b72cc86559bba157e60343 /include/bbcode.php
parentc0b59ae36a5ef31b9071edb991f63d4800e21a9d (diff)
parente18dfbe3ce0a8d89a5320e4f239801d0b84dd83e (diff)
downloadvolse-hubzilla-73ebdff0837a713d8849b713d0cc2fb4701a2c5f.tar.gz
volse-hubzilla-73ebdff0837a713d8849b713d0cc2fb4701a2c5f.tar.bz2
volse-hubzilla-73ebdff0837a713d8849b713d0cc2fb4701a2c5f.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/bbcode.php')
-rw-r--r--include/bbcode.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index a7055fc45..0803ed365 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -610,7 +610,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// Check for [spoiler=Author] text
- $t_wrote = t('$1 wrote:');
+ $t_wrote = t('$1 spoiler');
// handle nested quotes
$endlessloop = 0;