set permalink on photo tags

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 6a5f6364a780b8a88d02f22b3cf95c75cb9eeed9..1c7a1570526cfb88f5c4b19012d30ae31fed0f2b 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -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',      1061      );
+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;
 
@@ -2574,7 +2562,7 @@ function prepare_body($item,$attach = false) {
                foreach($arr as $r) {
                        $matches = false;
                        $icon = '';
-                       $cnt = preg_match('|\[attach\]href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" title=\"(.+?)\"\[\/attach\]|',$r,$matches);
+                       $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
                        if($cnt) {
                                $icontype = strtolower(substr($matches[3],0,strpos($matches[3],'/')));
                                switch($icontype) {