aboutsummaryrefslogtreecommitdiffstats
path: root/include/socgraph.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 /include/socgraph.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 'include/socgraph.php')
-rw-r--r--include/socgraph.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/socgraph.php b/include/socgraph.php
index e44a8ea9a..1b1bccf20 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -409,7 +409,7 @@ function poco($a,$extended = false) {
http_status_exit(401);
}
- $observer = $a->get_observer();
+ $observer = App::get_observer();
if(argc() > 1) {
$user = notags(trim(argv(1)));