diff options
| author | friendica <info@friendica.com> | 2014-11-22 12:26:33 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-11-22 12:26:33 -0800 |
| commit | 86b6861aaeec44d4cc9c0e180915dae7fcaf6a97 (patch) | |
| tree | a4a126cf558d7edad376135f57a4171589d70e18 /include/text.php | |
| parent | b16f93883077a3637d055a4c70a28ef0c994efec (diff) | |
| parent | ab5bf1b7d69f4027f595eef56cf4d99207b8b46e (diff) | |
| download | volse-hubzilla-86b6861aaeec44d4cc9c0e180915dae7fcaf6a97.tar.gz volse-hubzilla-86b6861aaeec44d4cc9c0e180915dae7fcaf6a97.tar.bz2 volse-hubzilla-86b6861aaeec44d4cc9c0e180915dae7fcaf6a97.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php index 22a1a78c4..ce729ac1b 100644 --- a/include/text.php +++ b/include/text.php @@ -1815,8 +1815,13 @@ function legal_webbie($s) { function check_webbie($arr) { + $reservechan = get_config('system','reserved_channels'); + if(strlen($reservechan)) + $taken = explode(',', $reservechan); + else + $taken = array(); + $str = ''; - $taken = array(); if(count($arr)) { foreach($arr as $x) { $y = legal_webbie($x); |