friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'pull'

This commit is contained in:
friendica 2012-02-27 17:18:53 -08:00
parent d7407f8daa e11b51aca1
commit 6c0fa7a166
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/template_processor.php
View File

@ -161,6 +161,7 @@
return $s; return $s;
} }
/*
private function _str_replace($str){ private function _str_replace($str){
#$this->search,$this->replace, #$this->search,$this->replace,
$searchs = $this->search; $searchs = $this->search;
@ -183,7 +184,7 @@
} }
return str_replace($this->search,$this->replace, $str); return str_replace($this->search,$this->replace, $str);
} }*/
public function replace($s, $r) { public function replace($s, $r) {
@ -205,7 +206,8 @@
$os = ""; $count=0; $os = ""; $count=0;
while($os!=$s && $count<10){ while($os!=$s && $count<10){
$os=$s; $count++; $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); return template_unescape($s);
} }

6
library/spam/b8/storage/storage_frndc.php
View File

@ -256,7 +256,7 @@ class b8_storage_frndc extends b8_storage_base
$token = dbesc($token); $token = dbesc($token);
$count = dbesc($count); $count = dbesc($count);
$uid = dbesc($uid); $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); $token = dbesc($token);
$count = dbesc($count); $count = dbesc($count);
$uid = dbesc($uid); $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) { if(count($this->_updates) > 0) {
// this still needs work // 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(' $result = q('

4
mod/contacts.php
View File

@ -504,8 +504,8 @@ function contacts_content(&$a) {
'name' => $rr['name'], 'name' => $rr['name'],
'username' => $rr['name'], 'username' => $rr['name'],
'sparkle' => $sparkle, 'sparkle' => $sparkle,
'url' => $url, 'itemurl' => $rr['url'],
'item' => $rr, 'network' => network_to_name($rr['network']),
); );
} }

4
view/contact_template.tpl
View File

@ -17,8 +17,8 @@
</div> </div>
<div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</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-url-$contact.id" >$contact.itemurl</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-network-$contact.id" >$contact.network</div>
</div> </div>