rev update

diff --git a/boot.php b/boot.php
index 34d35df70da9924063c3b48e54e4ea0098d93465..cd6f6a8d889ae563b961e4fd321d1ae00d2a4317 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1614' );
+define ( 'FRIENDICA_VERSION',      '3.1.1618' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1159      );
 

diff --git a/include/network.php b/include/network.php
index f6e6cc2a30825c189ab77f196f0780b39ac80586..2a8dcc83adeb1c7d9e45eb73d06db1e3cd026fcf 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -15,8 +15,10 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
 
        @curl_setopt($ch, CURLOPT_HEADER, true);
 
-       @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-       @curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
+
+//  These settings aren't needed. We're following the location already. 
+//     @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+//     @curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
 
        if (!is_null($accept_content)){
                curl_setopt($ch,CURLOPT_HTTPHEADER, array (

diff --git a/util/messages.po b/util/messages.po
index 14ac219f6a119bb9eeb21e93cef2809157841f2e..7025ea5c43c7a990c2ec1467a6cd64d283bd2a10 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1614\n"
+"Project-Id-Version: 3.1.1618\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-17 00:00-0800\n"
+"POT-Creation-Date: 2013-02-21 00:00-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5326,7 +5326,7 @@ msgstr ""
 msgid "Site map"
 msgstr ""
 
-#: ../../include/network.php:850
+#: ../../include/network.php:852
 msgid "view full size"
 msgstr ""
 
@@ -9175,7 +9175,7 @@ msgid ""
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:871
+#: ../../mod/item.php:873
 #, php-format
 msgid "%s posted an update."
 msgstr ""