sforkowany z mirror/friendica
Merge branch 'pull'
commit
6c0fa7a166
|
@ -160,7 +160,8 @@
|
|||
krsort($this->nodes);
|
||||
return $s;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
private function _str_replace($str){
|
||||
#$this->search,$this->replace,
|
||||
$searchs = $this->search;
|
||||
|
@ -183,7 +184,7 @@
|
|||
|
||||
}
|
||||
return str_replace($this->search,$this->replace, $str);
|
||||
}
|
||||
}*/
|
||||
|
||||
|
||||
public function replace($s, $r) {
|
||||
|
@ -205,7 +206,8 @@
|
|||
$os = ""; $count=0;
|
||||
while($os!=$s && $count<10){
|
||||
$os=$s; $count++;
|
||||
$s = $this->_str_replace($s);
|
||||
//$s = $this->_str_replace($s);
|
||||
$s = str_replace($this->search, $this->replace, $s);
|
||||
}
|
||||
return template_unescape($s);
|
||||
}
|
||||
|
|
|
@ -256,7 +256,7 @@ class b8_storage_frndc extends b8_storage_base
|
|||
$token = dbesc($token);
|
||||
$count = dbesc($count);
|
||||
$uid = dbesc($uid);
|
||||
array_push($this->_puts, '("' . $token . '", "' . $count . '", '"' . $uid .'")');
|
||||
array_push($this->_puts, '("' . $token . '", "' . $count . '", "' . $uid .'")');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -273,7 +273,7 @@ class b8_storage_frndc extends b8_storage_base
|
|||
$token = dbesc($token);
|
||||
$count = dbesc($count);
|
||||
$uid = dbesc($uid);
|
||||
array_push($this->_puts, '("' . $token . '", "' . $count . '", '"' . $uid .'")');
|
||||
array_push($this->_puts, '("' . $token . '", "' . $count . '", "' . $uid .'")');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -325,7 +325,7 @@ class b8_storage_frndc extends b8_storage_base
|
|||
if(count($this->_updates) > 0) {
|
||||
|
||||
// this still needs work
|
||||
$result = q("select * from " . $this->config['table_name'] . ' where token = ';
|
||||
$result = q("select * from " . $this->config['table_name'] . ' where token = ');
|
||||
|
||||
|
||||
$result = q('
|
||||
|
|
|
@ -504,8 +504,8 @@ function contacts_content(&$a) {
|
|||
'name' => $rr['name'],
|
||||
'username' => $rr['name'],
|
||||
'sparkle' => $sparkle,
|
||||
'url' => $url,
|
||||
'item' => $rr,
|
||||
'itemurl' => $rr['url'],
|
||||
'network' => network_to_name($rr['network']),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
</div>
|
||||
<div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div>
|
||||
<div class="contact-details" id="contact-entry-url-$contact.id" >$contact.item.url</div>
|
||||
<div class="contact-details" id="contact-entry-network-$contact.id" >$contact.item.network|network_to_name</div>
|
||||
<div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
|
||||
<div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
|
Ładowanie…
Reference in New Issue