diff options
| author | Max Kostikov <max@kostikov.co> | 2019-06-18 11:47:26 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-06-18 11:47:26 +0200 |
| commit | e2abc0b7277956651d2947c34a0522a77a59a9a5 (patch) | |
| tree | 95e9c8863d20b7c91a6d07297cacd2ef8cf32818 /include | |
| parent | 43cec4398d0d035dd9446988134b814513a73080 (diff) | |
| parent | a677a68ab7e1f50f5b11c02a42dbc6cad3ebb444 (diff) | |
| download | volse-hubzilla-e2abc0b7277956651d2947c34a0522a77a59a9a5.tar.gz volse-hubzilla-e2abc0b7277956651d2947c34a0522a77a59a9a5.tar.bz2 volse-hubzilla-e2abc0b7277956651d2947c34a0522a77a59a9a5.zip | |
Merge branch 'dev' into 'dev'
Dev
See merge request kostikov/core!1
Diffstat (limited to 'include')
| -rw-r--r-- | include/features.php | 14 | ||||
| -rw-r--r-- | include/photos.php | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/include/features.php b/include/features.php index 9528d3418..87df0c50d 100644 --- a/include/features.php +++ b/include/features.php @@ -280,20 +280,6 @@ function get_features($filtered = true, $level = (-1)) { ], - 'events' => [ - - t('Events'), - - [ - 'events_cal_first_day', - t('Start calendar week on Monday'), - t('Default is Sunday'), - false, - get_config('feature_lock','events_cal_first_day') - ] - - ], - 'manage' => [ t('Manage'), diff --git a/include/photos.php b/include/photos.php index 7ea2729ae..7fd712f3e 100644 --- a/include/photos.php +++ b/include/photos.php @@ -390,7 +390,7 @@ function photo_upload($channel, $observer, $args) { 'edited' => $p['edited'], 'id' => z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash, 'link' => $link, - 'body' => $obj_body + 'body' => $summary ); $target = array( |