aboutsummaryrefslogtreecommitdiffstats
path: root/include/dir_fns.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-12 07:46:29 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-12 07:46:29 +0100
commit63063450b3da34bf4843fb8d3ffdafc5b32514bc (patch)
tree54c5b384f5077dbd7bc7c5a76c5a6d4c84108ca3 /include/dir_fns.php
parent90463ee67de2937dddfd6a28cc0514feab47c27c (diff)
parent6e04dd96a1ff001f67db59e796b36cba30e4fdb4 (diff)
downloadvolse-hubzilla-63063450b3da34bf4843fb8d3ffdafc5b32514bc.tar.gz
volse-hubzilla-63063450b3da34bf4843fb8d3ffdafc5b32514bc.tar.bz2
volse-hubzilla-63063450b3da34bf4843fb8d3ffdafc5b32514bc.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/dir_fns.php')
-rw-r--r--include/dir_fns.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php
index 398f43d00..b9f221bd1 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -18,7 +18,7 @@ function find_upstream_directory($dirmode) {
// Thwart attempts to use a private directory
- if(($preferred) && ($prefered != z_root())) {
+ if(($preferred) && ($preferred != z_root())) {
$r = q("select * from site where site_url = '%s' limit 1",
dbesc($preferred)
);