aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-10-14 16:46:00 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-10-14 16:46:00 +0000
commitb8c2eef9745388d3ab9b082a410f39a4beb021e3 (patch)
treea3671b2ed6325ab6eb314febaace82e90217caaa /engine
parentd7f0cb9482c4d7859ad6264df752f6edd568b263 (diff)
downloadelgg-b8c2eef9745388d3ab9b082a410f39a4beb021e3.tar.gz
elgg-b8c2eef9745388d3ab9b082a410f39a4beb021e3.tar.bz2
The word blacklist for filter_string is now loaded on init.
git-svn-id: https://code.elgg.org/elgg/trunk@2258 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/social.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/engine/lib/social.php b/engine/lib/social.php
index 14328376e..036173dfc 100644
--- a/engine/lib/social.php
+++ b/engine/lib/social.php
@@ -64,7 +64,8 @@
// Set the shout words blacklist, these do not become tags when the string is converted
// Any language packs should include their own!
- GLOBAL $CONFIG;
+ function social_init() {
+ global $CONFIG;
$CONFIG->wordblacklist = array(
'and',
'the',
@@ -101,5 +102,8 @@
'whoever',
'whomever',
);
+ }
+
+ register_elgg_event_handler("init","system","social_init");
?> \ No newline at end of file