diff --git a/boot.php b/boot.php index 1f2b47b2e0..2521ab25a6 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1217' ); +define ( 'FRIENDICA_VERSION', '2.3.1219' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1115 ); diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 4749027046..3211a0e584 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -74,7 +74,7 @@ function network_to_name($s) { call_hooks('network_to_name', $s); - return str_replace(array(NETWORK_DFRN,NETWORK_OSTATUS,NETWORK_FEED,NETWORK_MAIL,NETWORK_DIASPORA,NETWORK_FACEBOOK,NETWORK_ZOT), - array(t('Friendica'),t('OStatus'),t('RSS/Atom'),t('Email'),t('Diaspora'),t('Facebook'),t('Zot!')),$s); + return str_replace(array(NETWORK_DFRN,NETWORK_OSTATUS,NETWORK_FEED,NETWORK_MAIL,NETWORK_DIASPORA,NETWORK_FACEBOOK,NETWORK_ZOT,NETWORK_LINKEDIN,NETWORK_XMPP,NETWORK_MYSPACE), + array( t('Friendica'), t('OStatus'), t('RSS/Atom'), t('Email'), t('Diaspora'), t('Facebook'), t('Zot!'), t('LinkedIn'), t('XMPP/IM'), t('MySpace')),$s); } diff --git a/view/theme/testbubble/photo_top.tpl b/view/theme/testbubble/photo_top.tpl index d552409c4f..48a546a16e 100644 --- a/view/theme/testbubble/photo_top.tpl +++ b/view/theme/testbubble/photo_top.tpl @@ -1,8 +1,8 @@
- $imgalt + $phoyo.alt
-
$albumname
+
$photo.album.name