diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-28 17:15:34 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-28 17:15:34 -0700 |
| commit | 3b53cd56ef151586024cb99742a91d4a75afdb5b (patch) | |
| tree | f0d02417d5cac33bb1d7999bbeefd11848b18d7f /include/dir_fns.php | |
| parent | 6368b093375d50f929b0a419834299e6b62e274e (diff) | |
| parent | 30e88a4f6b38e1d51ebcd97ac4b81c29f9ce4823 (diff) | |
| download | volse-hubzilla-3b53cd56ef151586024cb99742a91d4a75afdb5b.tar.gz volse-hubzilla-3b53cd56ef151586024cb99742a91d4a75afdb5b.tar.bz2 volse-hubzilla-3b53cd56ef151586024cb99742a91d4a75afdb5b.zip | |
Merge branch 'deadsite'
Diffstat (limited to 'include/dir_fns.php')
| -rw-r--r-- | include/dir_fns.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php index 38c92dd94..e466b7404 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -151,16 +151,18 @@ function sync_directories($dirmode) { $realm = get_directory_realm(); if ($realm == DIRECTORY_REALM) { - $r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s' and ( site_realm = '%s' or site_realm = '') ", + $r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s' and site_type = %d and ( site_realm = '%s' or site_realm = '') ", intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY), dbesc(z_root()), + intval(SITE_TYPE_ZOT), dbesc($realm) ); } else { - $r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s' and site_realm like '%s' ", + $r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s' and site_realm like '%s' and site_type = %d ", intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY), dbesc(z_root()), - dbesc(protect_sprintf('%' . $realm . '%')) + dbesc(protect_sprintf('%' . $realm . '%')), + intval(SITE_TYPE_ZOT) ); } @@ -187,9 +189,10 @@ function sync_directories($dirmode) { intval($r[0]['site_valid']) ); - $r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s'", + $r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s' and site_type = %d ", intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY), - dbesc(z_root()) + dbesc(z_root()), + intval(SITE_TYPE_ZOT) ); } if (! $r) |