aboutsummaryrefslogtreecommitdiffstats
path: root/util/pconfig
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 /util/pconfig
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 'util/pconfig')
-rwxr-xr-xutil/pconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/pconfig b/util/pconfig
index cefa6901c..038fa74c3 100755
--- a/util/pconfig
+++ b/util/pconfig
@@ -20,7 +20,7 @@ if($argc == 4) {
if($argc == 3) {
load_pconfig($argv[1],$argv[2]);
- foreach($a->config[$argv[1]][$argv[2]] as $k => $x) {
+ foreach(App::$config[$argv[1]][$argv[2]] as $k => $x) {
echo "pconfig[{$argv[1]}][{$argv[2]}][{$k}] = " . $x . "\n";
}
}