diff options
| author | friendica <info@friendica.com> | 2012-01-07 13:00:06 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-01-07 13:00:06 -0800 |
| commit | 358b2a46f5b48e5b95b75ed87752a87dccde8d8e (patch) | |
| tree | 2b462d01b2d019ecbcba7cec0dbf03041d798c89 | |
| parent | 41bb47ca1b5790442e571d5eb3bbb4dd89708a03 (diff) | |
| download | volse-hubzilla-358b2a46f5b48e5b95b75ed87752a87dccde8d8e.tar.gz volse-hubzilla-358b2a46f5b48e5b95b75ed87752a87dccde8d8e.tar.bz2 volse-hubzilla-358b2a46f5b48e5b95b75ed87752a87dccde8d8e.zip | |
fix photo top view in testbubble, extend network_to_name
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/contact_selectors.php | 4 | ||||
| -rw-r--r-- | view/theme/testbubble/photo_top.tpl | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -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 474902704..3211a0e58 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 d552409c4..48a546a16 100644 --- 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> |