diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-08 07:21:19 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-08 07:21:19 +0200 |
| commit | 9ef5cb1c385e598d16ea78fef7f4207603ea4e79 (patch) | |
| tree | 657eee7d73a33ff860e64f332e43781b033037cb /boot.php | |
| parent | e036434b8a2dbd8594c0ac5ac7233f4700e4e475 (diff) | |
| parent | e2f1540f25cae5b647fbebacac105d03cff17502 (diff) | |
| download | volse-hubzilla-9ef5cb1c385e598d16ea78fef7f4207603ea4e79.tar.gz volse-hubzilla-9ef5cb1c385e598d16ea78fef7f4207603ea4e79.tar.bz2 volse-hubzilla-9ef5cb1c385e598d16ea78fef7f4207603ea4e79.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -4,9 +4,9 @@ set_time_limit(0); ini_set('pcre.backtrack_limit', 250000); -define ( 'FRIENDIKA_VERSION', '2.2.1003' ); +define ( 'FRIENDIKA_VERSION', '2.2.1004' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1061 ); +define ( 'DB_UPDATE_VERSION', 1062 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -2574,7 +2574,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) { |