diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-09 10:20:47 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-09 10:20:47 +0200 |
| commit | 7ffd0ee41a70d30cadf18032f655222911304b7c (patch) | |
| tree | 8951d4ac7d5a8b1d27929742890914c8c57c23e0 /boot.php | |
| parent | 6f9fd92c2eabd1b26182e2f7157f35e44f94dc67 (diff) | |
| parent | 9203b48527050b0b4a17120a95b2b3202842d56d (diff) | |
| download | volse-hubzilla-7ffd0ee41a70d30cadf18032f655222911304b7c.tar.gz volse-hubzilla-7ffd0ee41a70d30cadf18032f655222911304b7c.tar.bz2 volse-hubzilla-7ffd0ee41a70d30cadf18032f655222911304b7c.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 18 |
1 files changed, 3 insertions, 15 deletions
@@ -4,9 +4,9 @@ set_time_limit(0); ini_set('pcre.backtrack_limit', 250000); -define ( 'FRIENDIKA_VERSION', '2.2.1004' ); +define ( 'FRIENDIKA_VERSION', '2.2.1005' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1062 ); +define ( 'DB_UPDATE_VERSION', 1063 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -527,20 +527,8 @@ function check_config(&$a) { $plugins = get_config('system','addon'); $plugins_arr = array(); - if($plugins) { + if($plugins) $plugins_arr = explode(',',str_replace(' ', '',$plugins)); - if(get_config('system','strict_privacy')) { - unset($a->config['system']['huburl']); - for($x = 0; $x < count($plugins_arr); $x ++) { - if( $plugins_arr[$x] === 'facebook' - || $plugins_arr[$x] === 'twitter' - || $plugins_arr[$x] === 'statusnet') { - unset($plugins_arr[$x]); - } - } - } - } - $a->plugins = $plugins_arr; |