diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /mod/filerm.php | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'mod/filerm.php')
| -rw-r--r-- | mod/filerm.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/filerm.php b/mod/filerm.php index bd8ce7cfc..82eed83f8 100644 --- a/mod/filerm.php +++ b/mod/filerm.php @@ -13,7 +13,7 @@ function filerm_content(&$a) { if($category) $term = $cat; - $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); + $item_id = ((App::$argc > 1) ? intval(App::$argv[1]) : 0); logger('filerm: tag ' . $term . ' item ' . $item_id); @@ -27,7 +27,7 @@ function filerm_content(&$a) { } if(x($_SESSION,'return_url')) - goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); + goaway(z_root() . '/' . $_SESSION['return_url']); killme(); } |