diff options
| author | friendica <info@friendica.com> | 2013-12-13 13:30:33 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-13 13:30:33 -0800 |
| commit | 0215043826c2c036c3a2c88fa6e42089138c7c52 (patch) | |
| tree | cb0eb5f53befcef093b19b49387c5cc7e7fa8e1e /include | |
| parent | 94975f8d3081051df48b6fdd73be3f4be5484cf6 (diff) | |
| download | volse-hubzilla-0215043826c2c036c3a2c88fa6e42089138c7c52.tar.gz volse-hubzilla-0215043826c2c036c3a2c88fa6e42089138c7c52.tar.bz2 volse-hubzilla-0215043826c2c036c3a2c88fa6e42089138c7c52.zip | |
prepare for Comanchification of mod_photos
Diffstat (limited to 'include')
| -rw-r--r-- | include/Contact.php | 13 | ||||
| -rw-r--r-- | include/photos.php | 12 |
2 files changed, 23 insertions, 2 deletions
diff --git a/include/Contact.php b/include/Contact.php index 5725e06f0..20dd04d17 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -77,6 +77,19 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { $a = get_app(); + if(! $xchan) { + if($a->profile['channel_hash']) + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($a->profile['channel_hash']) + ); + if($r) + $xchan = $r[0]; + } + + if(! $xchan) + return; + +// FIXME - show connect button to observer if appropriate $connect = false; if(local_user()) { $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1", diff --git a/include/photos.php b/include/photos.php index ea4b494e0..9828140b8 100644 --- a/include/photos.php +++ b/include/photos.php @@ -279,8 +279,16 @@ function photos_album_widget($channelx,$observer,$albums = null) { $o = ''; - if(! $albums) - $albums = photos_albums_list($channelx,$observer); + // If we weren't passed an album list, see if the photos module + // dropped one for us to find in $a->data['albums']. + // If all else fails, load it. + + if(! $albums) { + if(array_key_exists('albums', get_app()->data)) + $albums = get_app()->data['albums']; + else + $albums = photos_albums_list($channelx,$observer); + } if($albums) { $o = replace_macros(get_markup_template('photo_albums.tpl'),array( |