activity object link had incorrect attribute, highlight critical install steps

diff --git a/INSTALL.txt b/INSTALL.txt
index 577f3f354c25ae142dec54b108fd37fd93bc0d68..70e4f24efdee8e44259cce5ed37606ebad91d5d2 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -17,7 +17,7 @@ hosting provider prior to installation.
        - Apache with mod-rewrite enabled and "Options All" so you can use a 
 local .htaccess file
 
-       - PHP > 5.1. The later the better. You'll need 5.3 for encryption of key
+       - PHP 5.2+. The later the better. You'll need 5.3 for encryption of key
 exchange conversations
 encryption support
                - PHP *command line* access with register_argc_argv set to true in the 
@@ -67,6 +67,12 @@ database was not installed correctly. You might wish to move/rename
 .htconfig.php to another name and empty (called 'dropping') the database 
 tables, so that you can start fresh.  
 
+****************************************************************************
+****************************************************************************
+********          THIS NEXT STEP IS IMPORTANT!!!!                ***********
+****************************************************************************
+****************************************************************************
+
 7. Set up a cron job or scheduled task to run the poller once every 5-10 
 minutes to pick up the recent "public" postings of your friends. Example:
 

diff --git a/boot.php b/boot.php
index d8549d5c0ae2445f9af63133fe4e28b6dd260ed2..d168a2b8e27748ce54821de047c812a44af53662 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -3,7 +3,7 @@
 set_time_limit(0);
 
 define ( 'BUILD_ID',               1031   );
-define ( 'FRIENDIKA_VERSION',      '2.01.1001' );
+define ( 'FRIENDIKA_VERSION',      '2.01.1002' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.0'  );
 
 define ( 'EOL',                    "<br />\r\n"     );

diff --git a/include/items.php b/include/items.php
index 1a5ca5a1fadd8e12285a4609b2f9bab462ab1890..c076e0fbf72529cc02daeb8f632739439d70c23b 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -35,6 +35,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
        else
                killme();
 
+
        /**
         *
         * Determine the next birthday, but only if the birthday is published
@@ -571,7 +572,7 @@ function encode_rel_links($links) {
                if($link['attribs']['']['type'])
                        $o .= 'type="' . $link['attribs']['']['type'] . '" ';
                if($link['attribs']['']['href'])
-                       $o .= 'type="' . $link['attribs']['']['href'] . '" ';
+                       $o .= 'href="' . $link['attribs']['']['href'] . '" ';
                if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['width'])
                        $o .= 'media:width="' . $link['attribs'][NAMESPACE_MEDIA]['width'] . '" ';
                if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['height'])