diff options
| -rwxr-xr-x | include/items.php | 2 | ||||
| -rw-r--r-- | include/photo/photo_driver.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php index 730d81268..c9810bb7c 100755 --- a/include/items.php +++ b/include/items.php @@ -1570,7 +1570,7 @@ function get_atom_elements($feed,$item,&$author) { // We could probably turn these old Friendica bbcode bookmarks into bookmark tags but we'd have to // create a term table item for them. For now just make sure they stay as links. - $res['body'] = preg_replace('/\[bookmark(.*?)\](.*?)\[\/bookmark\]','[url$1]$2[/url]',$res['body']); + $res['body'] = preg_replace('/\[bookmark(.*?)\](.*?)\[\/bookmark\]/','[url$1]$2[/url]',$res['body']); } diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index c416c0df3..0853ce84e 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -8,6 +8,7 @@ function photo_factory($data, $type = null) { if(class_exists('Imagick') && !$ignore_imagick) { $v = Imagick::getVersion(); preg_match('/ImageMagick ([0-9]+\.[0-9]+\.[0-9]+)/', $v['versionString'], $m); + logger('image v='.$v.',v[ver]='.$v['versionString'].',matches='.var_export($m, true), LOGGER_DEBUG); if(version_compare($m[1],'6.6.7') >= 0) { require_once('include/photo/photo_imagick.php'); $ph = new photo_imagick($data,$type); |