aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-01-14 23:23:28 +0100
committerMario Vavti <mario@mariovavti.com>2016-01-14 23:23:28 +0100
commit3ba81c8bb63e6bd99ea0ad3d6263bca10deb872c (patch)
tree78f004bfdbcf67ad7400d3814cfced3eaf51bed2
parent588d022fbb8490f0531b7e44a6af0b596409dc38 (diff)
parent96990fc1c578850af36aee12fd971c89979a817d (diff)
downloadvolse-hubzilla-3ba81c8bb63e6bd99ea0ad3d6263bca10deb872c.tar.gz
volse-hubzilla-3ba81c8bb63e6bd99ea0ad3d6263bca10deb872c.tar.bz2
volse-hubzilla-3ba81c8bb63e6bd99ea0ad3d6263bca10deb872c.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
-rw-r--r--mod/cover_photo.php4
-rw-r--r--version.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/cover_photo.php b/mod/cover_photo.php
index fd7d794f5..a6262ed7c 100644
--- a/mod/cover_photo.php
+++ b/mod/cover_photo.php
@@ -103,7 +103,7 @@ function cover_photo_post(&$a) {
$aid = get_account_id();
$p = array('aid' => $aid, 'uid' => local_channel(), 'resource_id' => $base_image['resource_id'],
- 'filename' => $base_image['filename'], 'album' => t('Profile Photos'));
+ 'filename' => $base_image['filename'], 'album' => t('Cover Photos'));
$p['scale'] = 7;
$p['photo_usage'] = PHOTO_COVER;
@@ -143,7 +143,7 @@ function cover_photo_post(&$a) {
require_once('include/attach.php');
- $res = attach_store($a->get_channel(), get_observer_hash(), '', array('album' => t('Profile Photos'), 'hash' => $hash));
+ $res = attach_store($a->get_channel(), get_observer_hash(), '', array('album' => t('Cover Photos'), 'hash' => $hash));
logger('attach_store: ' . print_r($res,true));
diff --git a/version.inc b/version.inc
index a2d8d6da6..51bef3134 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-13.1277H
+2016-01-14.1278H