diff options
author | Evan Prodromou <evan@status.net> | 2010-04-26 02:53:24 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-04-26 02:53:24 -0400 |
commit | 50bfa218141a30c5041957aae60b9be78fe74950 (patch) | |
tree | 3cbc164992cdec2348a6c2908bab197af6c9e227 /plugins/Blacklist/BlacklistPlugin.php | |
parent | beaecb18d5b92b913473dfffd545dc436f50cf66 (diff) | |
parent | 8fd0059bf69ed16ed4efad7b8e16dc2afda32e18 (diff) |
Merge branch 'master' of gitorious.org:statusnet/mainline
Diffstat (limited to 'plugins/Blacklist/BlacklistPlugin.php')
-rw-r--r-- | plugins/Blacklist/BlacklistPlugin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php index adc4d9d7e..63bffe2c6 100644 --- a/plugins/Blacklist/BlacklistPlugin.php +++ b/plugins/Blacklist/BlacklistPlugin.php @@ -262,7 +262,7 @@ class BlacklistPlugin extends Plugin $patterns = $this->_getUrlPatterns(); foreach ($patterns as $pattern) { - if (preg_match("/$pattern/", $url)) { + if ($pattern != '' && preg_match("/$pattern/", $url)) { return false; } } @@ -285,7 +285,7 @@ class BlacklistPlugin extends Plugin $patterns = $this->_getNicknamePatterns(); foreach ($patterns as $pattern) { - if (preg_match("/$pattern/", $nickname)) { + if ($pattern != '' && preg_match("/$pattern/", $nickname)) { return false; } } |