harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica
2013-09-09 04:57:55 -07:00
parent 0565a6ef01 147483f259
commit 4619993562
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
boot.php
View File

@@ -346,6 +346,17 @@ define ( 'XCHAN_FLAGS_HIDDEN', 0x0001);
define ( 'XCHAN_FLAGS_ORPHAN', 0x0002);
/*
* Traficlights for Administration of HubLoc
* to detect problems in inter server communication
*/
define ('HUBLOC_NOTUSED', 0x0000);
define ('HUBLOC_SEND_ERROR', 0x0001);
define ('HUBLOC_RECEIVE_ERROR', 0x0002);
define ('HUBLOC_WORKS', 0x0004);
define ('HUBLOC_OFFLINE', 0x0008);
/**
* Tag/term types
*/

2
include/zot.php
View File

@@ -1538,7 +1538,7 @@ function import_site($arr,$pubkey) {
}
}
else {
$r = q("insert into site ( site_url, site_acccess, site_flags, site_update, site_directory, site_register )
$r = q("insert into site ( site_url, site_access, site_flags, site_update, site_directory, site_register )
values ( '%s', %d, %d, '%s', '%s', %d )",
dbesc(htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false)),
intval($site_directory),