diff options
author | friendica <info@friendica.com> | 2014-01-07 14:10:28 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-01-07 14:10:28 -0800 |
commit | b8564134aaffc2ebe35fecd5dae4fd0f6523eb53 (patch) | |
tree | 1271c4ea29d9286c20da88cb2969c09e2a4af841 /include/photos.php | |
parent | e635dcb3092da962c29fe4c8e4ddc53de368002d (diff) | |
download | volse-hubzilla-b8564134aaffc2ebe35fecd5dae4fd0f6523eb53.tar.gz volse-hubzilla-b8564134aaffc2ebe35fecd5dae4fd0f6523eb53.tar.bz2 volse-hubzilla-b8564134aaffc2ebe35fecd5dae4fd0f6523eb53.zip |
make storage limit service classes apply to accounts, not channels. Also include a css file that was missing from work yesterday.
Diffstat (limited to 'include/photos.php')
-rw-r--r-- | include/photos.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/photos.php b/include/photos.php index e41d1059a..e4367bf95 100644 --- a/include/photos.php +++ b/include/photos.php @@ -102,12 +102,10 @@ function photo_upload($channel, $observer, $args) { $imagedata = @file_get_contents($src); - $r = q("select sum(size) as total from photo where uid = %d and scale = 0 ", - intval($channel_id) + $r = q("select sum(size) as total from photo where aid = %d and scale = 0 ", + intval($account_id) ); -// FIXME service class limits should probably apply to accounts and not channels - $limit = service_class_fetch($channel_id,'photo_upload_limit'); if(($r) && ($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) { |