diff options
author | Mike Macgirvin <mike@macgirvin.com> | 2010-10-04 04:22:34 -0700 |
---|---|---|
committer | Mike Macgirvin <mike@macgirvin.com> | 2010-10-04 04:22:34 -0700 |
commit | 941b2331f1b99b3f06cac9e7e864f08a2b44b9a9 (patch) | |
tree | 4064af5dc5c5fe1e74239e3e7e71e2292cb2ffb3 /include | |
parent | b8a9581acb3525c6c1c8dc872dd93cfba89c6dd8 (diff) | |
download | volse-hubzilla-941b2331f1b99b3f06cac9e7e864f08a2b44b9a9.tar.gz volse-hubzilla-941b2331f1b99b3f06cac9e7e864f08a2b44b9a9.tar.bz2 volse-hubzilla-941b2331f1b99b3f06cac9e7e864f08a2b44b9a9.zip |
xrd cannot be called before db is open to get language
Diffstat (limited to 'include')
-rw-r--r-- | include/hostxrd.php | 2 | ||||
-rw-r--r-- | include/items.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/hostxrd.php b/include/hostxrd.php index f3bf9e769..3279cea68 100644 --- a/include/hostxrd.php +++ b/include/hostxrd.php @@ -1,6 +1,6 @@ <?php - $tpl = load_view_file('view/xrd_host.tpl'); + $tpl = file_get_contents('view/xrd_host.tpl'); echo str_replace('$domain',$this->hostname,$tpl); session_write_close(); exit(); diff --git a/include/items.php b/include/items.php index ce354de9b..ac4e694be 100644 --- a/include/items.php +++ b/include/items.php @@ -718,7 +718,7 @@ function consume_feed($xml,$importer,$contact, &$hub) { ); // who is the last child now? $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d - ORDER BY `edited` DESC LIMIT 1", + ORDER BY `created` DESC LIMIT 1", dbesc($item['parent-uri']), intval($importer['uid']) ); |