diff options
| author | friendica <info@friendica.com> | 2012-02-27 17:18:53 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-27 17:18:53 -0800 |
| commit | 6c0fa7a1665ab36d733b93ce51802b14e8504658 (patch) | |
| tree | cbbf87df24912165e7a237b8d4996078319aa71b | |
| parent | d7407f8daaab14ecba59cc3cb211ff93802dd761 (diff) | |
| parent | e11b51aca14ea36b514fdd4348443f4fae79b2ca (diff) | |
| download | volse-hubzilla-6c0fa7a1665ab36d733b93ce51802b14e8504658.tar.gz volse-hubzilla-6c0fa7a1665ab36d733b93ce51802b14e8504658.tar.bz2 volse-hubzilla-6c0fa7a1665ab36d733b93ce51802b14e8504658.zip | |
Merge branch 'pull'
| -rwxr-xr-x | include/template_processor.php | 8 | ||||
| -rw-r--r-- | library/spam/b8/storage/storage_frndc.php | 6 | ||||
| -rwxr-xr-x | mod/contacts.php | 4 | ||||
| -rwxr-xr-x | view/contact_template.tpl | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/include/template_processor.php b/include/template_processor.php index 7f270fb4b..28c3f07dd 100755 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -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); } diff --git a/library/spam/b8/storage/storage_frndc.php b/library/spam/b8/storage/storage_frndc.php index 2b9374f67..cbc6fe81a 100644 --- a/library/spam/b8/storage/storage_frndc.php +++ b/library/spam/b8/storage/storage_frndc.php @@ -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(' diff --git a/mod/contacts.php b/mod/contacts.php index c8edea151..ce352fe20 100755 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -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']), ); } diff --git a/view/contact_template.tpl b/view/contact_template.tpl index d6f114d6e..f4c0670bf 100755 --- a/view/contact_template.tpl +++ b/view/contact_template.tpl @@ -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> |