Merge branch '0.7.x' of git@gitorious.org:laconica/dev

Conflicts:
	README
	lib/router.php

1 files changed, 6 insertions, 5 deletions

diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php
index 1b5365100..56a26176b 100644
--- a/plugins/LinkbackPlugin.php
+++ b/plugins/LinkbackPlugin.php
@@ -105,12 +105,13 @@ class LinkbackPlugin extends Plugin
             $pb = $match[1];
         }
 
-        $tb = $this->getTrackback($result->body, $result->final_url);
-
-        if (!empty($tb)) {
-            $this->trackback($result->final_url, $tb);
-        } else if (!empty($pb)) {
+        if (!empty($pb)) {
             $this->pingback($result->final_url, $pb);
+        } else {
+            $tb = $this->getTrackback($result->body, $result->final_url);
+            if (!empty($tb)) {
+                $this->trackback($result->final_url, $tb);
+            }
         }
 
         return $orig;