diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-01-28 10:08:39 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-01-28 10:08:39 +0100 |
| commit | bf8dadb9700fd0600a38116bf03588883350aab1 (patch) | |
| tree | a0f4c07381c9c32aff694ecceaad37bf5fdf8aa4 /boot.php | |
| parent | 444d82a5328433fbe48e18b928d35218905a756c (diff) | |
| parent | 5d77bd9489763721b8f3e4a51c8cef1181276157 (diff) | |
| download | volse-hubzilla-bf8dadb9700fd0600a38116bf03588883350aab1.tar.gz volse-hubzilla-bf8dadb9700fd0600a38116bf03588883350aab1.tar.bz2 volse-hubzilla-bf8dadb9700fd0600a38116bf03588883350aab1.zip | |
Merge remote branch 'friendika-master/master'
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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" ); @@ -1692,7 +1692,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 @@ -1878,7 +1878,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); }} |