aboutsummaryrefslogtreecommitdiffstats
path: root/mod/photo.php
diff options
context:
space:
mode:
authorPaolo Tacconi <p.tacconi@giunti.it>2016-04-15 09:20:58 +0200
committerPaolo Tacconi <p.tacconi@giunti.it>2016-04-15 09:20:58 +0200
commit45a854762b451dafb882bc56efce054b64420627 (patch)
tree958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /mod/photo.php
parent1806da0851dd5cf5978b19d12783ae3101a11257 (diff)
parenta29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff)
downloadvolse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz
volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2
volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'mod/photo.php')
-rw-r--r--mod/photo.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/photo.php b/mod/photo.php
index e8cd95f1c..93c6efa95 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -156,8 +156,8 @@ function photo_init(&$a) {
);
if($r) {
- logger('mod_photo: forbidden. ' . $a->query_string);
- $observer = $a->get_observer();
+ logger('mod_photo: forbidden. ' . App::$query_string);
+ $observer = App::get_observer();
logger('mod_photo: observer = ' . (($observer) ? $observer['xchan_addr'] : '(not authenticated)'));
$data = file_get_contents('images/nosign.png');
$mimetype = 'image/png';