Merge branch 'master' of https://github.com/friendica/friendica

diff --git a/boot.php b/boot.php
index c03eca498ec5913696ec0d9147185fca390655b0..93dbd5abab47b0ce21b4999485a6398d33e87fee 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,9 +12,9 @@ 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',      1162      );
+define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 

diff --git a/include/network.php b/include/network.php
index 400c1386be69a2779dd59894962037460bab79ee..941ef5e1b9db7482555ae4c07a532c5dd0e1c900 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -17,8 +17,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/update.php b/update.php
index 6dd58757b9fd6830c3f843e4108ac7bbe0a60155..40f22e6aa61e9835c3385fa8b0a8e5951d3a24cd 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1162 );
+define( 'UPDATE_VERSION' , 1163 );
 
 /**
  *
@@ -1409,9 +1409,6 @@ function update_1159() {
        if(!$r)
                return UPDATE_FAILED;
 
-       require_once('include/tags.php');
-       update_items();
-
        return UPDATE_SUCCESS;
 }
 
@@ -1439,3 +1436,8 @@ function update_1161() {
 
        return UPDATE_SUCCESS;
 }
+
+function update_1162() {
+       require_once('include/tags.php');
+       update_items();
+}

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 ""