diff options
| author | friendica <info@friendica.com> | 2013-12-26 13:08:16 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-26 13:08:16 -0800 |
| commit | c59688553c6f681fe7a11479b69dce8c3cd308dc (patch) | |
| tree | fd7aa629a07a592c97a459b19a8665ca6e0a2a7e /mod/photos.php | |
| parent | 152ed9637926f478a6d15a29950f085117172a6f (diff) | |
| download | volse-hubzilla-c59688553c6f681fe7a11479b69dce8c3cd308dc.tar.gz volse-hubzilla-c59688553c6f681fe7a11479b69dce8c3cd308dc.tar.bz2 volse-hubzilla-c59688553c6f681fe7a11479b69dce8c3cd308dc.zip | |
remove prettyphoto from core - this will affect the enhanced photo albums feature on the short term which has been disabled until we figure out how to make the setting per-theme instead of a core option. The library is still available in core (library/prettyphoto) currently but needs to be moved to theme js and loaded/accessed from there [for themes which use it]. Then the library will be removed. It appears that other lightboxes commonly use rel= to group photo albums. So we may provide a generic rel= tag in photo album templates so that the choice of lightbox or album viewer is not only a theme option but could also be accomplished with plugins.
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/mod/photos.php b/mod/photos.php index 3c724ddc2..85d3f50b0 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -817,25 +817,24 @@ function photos_content(&$a) { $ext = $phototypes[$rr['type']]; - if($a->get_template_engine() === 'internal') { - $imgalt_e = template_escape($rr['filename']); - $desc_e = template_escape($rr['description']); - } - else { - $imgalt_e = $rr['filename']; - $desc_e = $rr['description']; - } + $imgalt_e = $rr['filename']; + $desc_e = $rr['description']; + +// prettyphoto has potential license issues, so we can no longer include it in core +// The following lines would need to be modified so that they are provided in theme specific files +// instead of core modules for themes that wish to make use of prettyphoto. I would suggest +// the feature as a per-theme display option and putting the rel line inside a template. - if(feature_enabled($a->data['channel']['channel_id'],'prettyphoto')){ - $imagelink = ($a->get_baseurl() . '/photo/' . $rr['resource_id'] . '.' . $ext ); - $rel=("prettyPhoto[pp_gal]"); - } - else { +// if(feature_enabled($a->data['channel']['channel_id'],'prettyphoto')){ +// $imagelink = ($a->get_baseurl() . '/photo/' . $rr['resource_id'] . '.' . $ext ); +// $rel=("prettyPhoto[pp_gal]"); +// } +// else { $imagelink = ($a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/image/' . $rr['resource_id'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '')); $rel=("photo"); - } +// } $o .= replace_macros($tpl,array( '$id' => $rr['id'], |