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/smilies.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/smilies.php')
| -rw-r--r-- | mod/smilies.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/smilies.php b/mod/smilies.php index b22d0c6d2..2ccc007b4 100644 --- a/mod/smilies.php +++ b/mod/smilies.php @@ -1,7 +1,7 @@ <?php function smilies_content(&$a) { - if ($a->argv[1]==="json"){ + if (App::$argv[1]==="json"){ $tmp = list_smilies(); $results = array(); for($i = 0; $i < count($tmp['texts']); $i++) { |