aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-07-29 22:04:07 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-07-29 22:04:07 +0200
commit98fa996b3f5125b60e2653bca2218b08041ad6a4 (patch)
tree685c3909ac49f7a25cd39877f74ed56ada9b15e0 /boot.php
parent07e890a79a5c506b2e32272edf86ad4aba3b8fba (diff)
parentcbb6d37b6ca7e5d9e476fd3e7bea3ba56d3271e1 (diff)
downloadvolse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.tar.gz
volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.tar.bz2
volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 45e071003..ff6eeccf8 100755
--- a/boot.php
+++ b/boot.php
@@ -2009,7 +2009,6 @@ function load_pdl(&$a) {
if((! $s) && (($p = theme_include($n)) != ''))
$s = @file_get_contents($p);
-
if($s) {
comanche_parser($a, $s);
$a->pdl = $s;