Merge branch 'pull'

diff --git a/include/template_processor.php b/include/template_processor.php
index 7f270fb4b39504b9d601e12d2cc6603a8d6ffde0..28c3f07ddd1e46dfc477deb4f0fc9b7a1479d6c4 100755 (executable)
--- 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 2b9374f6786a0ce1a9c9a85edfe77818152cdd77..cbc6fe81a91e0bb53df39e0d7e291c6bf87496f7 100644 (file)
--- 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 c8edea151866d91c2cd56e3b75d8f5a22526bac9..ce352fe204c9ec3c91c9fb593b0a63c49ab60784 100755 (executable)
--- 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 d6f114d6ebab4e2d5e3946cbcb434e4bbf589a8b..f4c0670bfefcf505fd5cf203ed6dea1fcd00e522 100755 (executable)
--- 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>