From: friendica Date: Fri, 22 Feb 2013 00:42:34 +0000 (-0800) Subject: rev update X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=615b06035291910d61675d0d0cc9100f1c2bae4a;p=friendica.git rev update --- diff --git a/boot.php b/boot.php index 34d35df70d..cd6f6a8d88 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 f6e6cc2a30..2a8dcc83ad 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 14ac219f6a..7025ea5c43 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 \n" "Language-Team: LANGUAGE \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 ""