diff --git a/boot.php b/boot.php index c03eca498e..93dbd5abab 100644 --- 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', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/network.php b/include/network.php index 400c1386be..941ef5e1b9 100644 --- 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 6dd58757b9..40f22e6aa6 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ \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 ""