diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/datetime.php | 2 | ||||
| -rw-r--r-- | include/features.php | 1 | ||||
| -rw-r--r-- | include/identity.php | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/datetime.php b/include/datetime.php index bfd806f32..ace1ad14f 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -549,7 +549,7 @@ function update_birthdays() { $ev['event_xchan'] = $rr['xchan_hash']; $ev['start'] = datetime_convert('UTC', 'UTC', $rr['abook_dob']); $ev['finish'] = datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day '); - $ev['adjust'] = 1; + $ev['adjust'] = intval(feature_enabled($rr['abook_channel'],'smart_birthdays')); $ev['summary'] = sprintf( t('%1$s\'s birthday'), $rr['xchan_name']); $ev['description'] = sprintf( t('Happy Birthday %1$s'), '[zrl=' . $rr['xchan_url'] . ']' . $rr['xchan_name'] . '[/zrl]') ; diff --git a/include/features.php b/include/features.php index 9c925bc35..1ef070b00 100644 --- a/include/features.php +++ b/include/features.php @@ -57,6 +57,7 @@ function get_features($filtered = true) { array('nav_channel_select', t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false,get_config('feature_lock','nav_channel_select')), array('photo_location', t('Photo Location'), t('If location data is available on uploaded photos, link this to a map.'),false,get_config('feature_lock','photo_location')), + array('smart_birthdays', t('Smart Birthdays'), t('Make birthday events timezone aware in case your friends are scattered across the planet.'),true,get_config('feature_lock','smart_birthdays')), array('expert', t('Expert Mode'), t('Enable Expert Mode to provide advanced configuration options'),false,get_config('feature_lock','expert')), array('premium_channel', t('Premium Channel'), t('Allows you to set restrictions and terms on those that connect with your channel'),false,get_config('feature_lock','premium_channel')), ), diff --git a/include/identity.php b/include/identity.php index 0a88ed208..caf2de710 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1832,8 +1832,7 @@ function get_zcard($channel,$observer_hash = '',$args = array()) { $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['scale']; } else { - // @fixme remove this when we have a fallback cover photo and use that instead. - return; + $cover = $pphoto; } $o .= replace_macros(get_markup_template('zcard.tpl'),array( |