Merge branch 'fabrixxm-master'

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index d3187648c7859d25e478fc1d94562fc2c421b0b8..223c9416d1c62d4e07dd78ee8d245efbd08d2dc7 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -3,7 +3,7 @@
 set_time_limit(0);
 
 define ( 'BUILD_ID',               1033   );
-define ( 'FRIENDIKA_VERSION',      '2.01.1006' );
+define ( 'FRIENDIKA_VERSION',      '2.10.0902' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.0'  );
 
 define ( 'EOL',                    "<br />\r\n"     );
@@ -1691,7 +1691,7 @@ function get_tags($s) {
 
        $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
 
-       if(preg_match_all('/([@#][^ \x0D\x0A,:?]*)([ \x0D\x0A,:?]|$)/',$s,$match)) {
+       if(preg_match_all('/([@#][^ \x0D\x0A,:?]+)([ \x0D\x0A,:?]|$)/',$s,$match)) {
                foreach($match[1] as $match) {
                        if(strstr($match,"]")) {
                                // we might be inside a bbcode color tag - leave it alone
@@ -1877,7 +1877,7 @@ function aes_encrypt($val,$ky)
 
 if(! function_exists('linkify')) {
 function linkify($s) {
-       $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$1" >$1</a>', $s);
+       $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$1" target="external-link">$1</a>', $s);
        return($s);
 }}
 
@@ -2216,6 +2216,16 @@ function link_compare($a,$b) {
 }}
 
 
+if(! function_exists('prepare_body')) {
+function prepare_body($item) {
+
+       require_once('include/bbcode.php');
+
+       $s = smilies(bbcode($item['body']));
+
+       return $s;
+}}
+
 /**
  * 
  * Wrap calls to proc_close(proc_open()) and call hook
@@ -2229,6 +2239,7 @@ function link_compare($a,$b) {
  * 
  * $cmd and string args are surrounded with ""
  */
+
 if(! function_exists('run_proc')) {
 function proc_run($cmd){
        $args = func_get_args();
@@ -2241,4 +2252,3 @@ function proc_run($cmd){
        proc_close(proc_open($cmdline." &",array(),$foo));
 }}
 
-?>
\ No newline at end of file