From 615b06035291910d61675d0d0cc9100f1c2bae4a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 21 Feb 2013 16:42:34 -0800
Subject: [PATCH 1/2] rev update

---
 boot.php            | 2 +-
 include/network.php | 6 ++++--
 util/messages.po    | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/boot.php b/boot.php
index 34d35df70..cd6f6a8d8 100644
--- 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 f6e6cc2a3..2a8dcc83a 100644
--- 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 14ac219f6..7025ea5c4 100644
--- 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 ""

From a17dd541ee2385e62be7880783715296b373acd5 Mon Sep 17 00:00:00 2001
From: zottel <github@zottel.net>
Date: Fri, 22 Feb 2013 13:26:11 +0100
Subject: [PATCH 2/2] reorder the update of the item table as instructed by
 Michael Vogel

---
 boot.php   |  2 +-
 update.php | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/boot.php b/boot.php
index 200ce2817..93dbd5aba 100644
--- a/boot.php
+++ b/boot.php
@@ -14,7 +14,7 @@ require_once('include/features.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 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/update.php b/update.php
index 6dd58757b..40f22e6aa 100644
--- 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();
+}