Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-25 04:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed moved function

Browse source
This commit is contained in:
Michael Vogel 2016-03-15 07:18:11 +01:00 committed by Roland Haeder
parent 887f2e92a5
commit 79fb05ff80
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
2 changed files with 0 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/diaspora.php
View file

@ -517,7 +517,6 @@ class diaspora {
* @return string The id of the fcontact entry * @return string The id of the fcontact entry
*/ */
private function add_fcontact($arr, $update = false) { private function add_fcontact($arr, $update = false) {
/// @todo Remove this function from include/network.php
if($update) { if($update) {
$r = q("UPDATE `fcontact` SET $r = q("UPDATE `fcontact` SET

58
include/network.php
View file

@ -862,64 +862,6 @@ function parse_xml_string($s,$strict = true) {
return $x; return $x;
}} }}
function add_fcontact($arr,$update = false) {
if($update) {
$r = q("UPDATE `fcontact` SET
`name` = '%s',
`photo` = '%s',
`request` = '%s',
`nick` = '%s',
`addr` = '%s',
`batch` = '%s',
`notify` = '%s',
`poll` = '%s',
`confirm` = '%s',
`alias` = '%s',
`pubkey` = '%s',
`updated` = '%s'
WHERE `url` = '%s' AND `network` = '%s'",
dbesc($arr['name']),
dbesc($arr['photo']),
dbesc($arr['request']),
dbesc($arr['nick']),
dbesc($arr['addr']),
dbesc($arr['batch']),
dbesc($arr['notify']),
dbesc($arr['poll']),
dbesc($arr['confirm']),
dbesc($arr['alias']),
dbesc($arr['pubkey']),
dbesc(datetime_convert()),
dbesc($arr['url']),
dbesc($arr['network'])
);
}
else {
$r = q("insert into fcontact ( `url`,`name`,`photo`,`request`,`nick`,`addr`,
`batch`, `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated` )
values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
dbesc($arr['url']),
dbesc($arr['name']),
dbesc($arr['photo']),
dbesc($arr['request']),
dbesc($arr['nick']),
dbesc($arr['addr']),
dbesc($arr['batch']),
dbesc($arr['notify']),
dbesc($arr['poll']),
dbesc($arr['confirm']),
dbesc($arr['network']),
dbesc($arr['alias']),
dbesc($arr['pubkey']),
dbesc(datetime_convert())
);
}
return $r;
}
function scale_external_images($srctext, $include_link = true, $scale_replace = false) { function scale_external_images($srctext, $include_link = true, $scale_replace = false) {
// Suppress "view full size" // Suppress "view full size"