fix photo top view in testbubble, extend network_to_name

diff --git a/boot.php b/boot.php
index 1f2b47b2e0ea4a65c0aa8a934c1c7ff1df0e5b0e..2521ab25a6173e092ae5fc9a1d2fe7afaf0bac76 100644 (file)
--- 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 4749027046627e857c1c06ad91044e15ff583383..3211a0e584b7dbe88293bc2de523363cfbe9cfe3 100644 (file)
--- 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 d552409c4faa5dadfbe79ffb41791636f2e4e0b1..48a546a16e9d52656dd71a9919ae52d4be515d62 100644 (file)
--- a/view/theme/testbubble/photo_top.tpl
+++ b/view/theme/testbubble/photo_top.tpl
@@ -1,8 +1,8 @@
 
 <div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
        <div id="photo-album-wrapper-inner">
-       <a href="$photolink" class="photo-top-photo-link" id="photo-top-photo-link-$id" title="$phototitle"><img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-top-photo" id="photo-top-photo-$id" /></a>
+       <a href="$photo.link" class="photo-top-photo-link" id="photo-top-photo-link-$id" title="$photo.title"><img src="$photo.src" alt="$phoyo.alt" title="$photo.title" class="photo-top-photo" id="photo-top-photo-$id" /></a>
        </div>
-       <div class="photo-top-album-name"><a href="$albumlink" class="photo-top-album-link" title="$albumalt" >$albumname</a></div>
+       <div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
 </div>
 <div class="photo-top-image-wrapper-end"></div>