MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Tobias Diekershoff 2013-02-22 16:05:11 +01:00
parent 41f31f3282 ad16311be6
commit 6db780dd33
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot.php
View file

@ -12,9 +12,9 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/features.php'); require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.1.1614' ); define ( 'FRIENDICA_VERSION', '3.1.1618' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1162 ); define ( 'DB_UPDATE_VERSION', 1163 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

6
include/network.php
View file

@ -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_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)){ if (!is_null($accept_content)){
curl_setopt($ch,CURLOPT_HTTPHEADER, array ( curl_setopt($ch,CURLOPT_HTTPHEADER, array (

10
update.php
View file

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1162 ); define( 'UPDATE_VERSION' , 1163 );
/** /**
* *
@ -1409,9 +1409,6 @@ function update_1159() {
if(!$r) if(!$r)
return UPDATE_FAILED; return UPDATE_FAILED;
require_once('include/tags.php');
update_items();
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
} }
@ -1439,3 +1436,8 @@ function update_1161() {
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
} }
function update_1162() {
require_once('include/tags.php');
update_items();
}

8
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.1.1614\n" "Project-Id-Version: 3.1.1618\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -5326,7 +5326,7 @@ msgstr ""
msgid "Site map" msgid "Site map"
msgstr "" msgstr ""
#: ../../include/network.php:850 #: ../../include/network.php:852
msgid "view full size" msgid "view full size"
msgstr "" msgstr ""
@ -9175,7 +9175,7 @@ msgid ""
"receive these messages." "receive these messages."
msgstr "" msgstr ""
#: ../../mod/item.php:871 #: ../../mod/item.php:873
#, php-format #, php-format
msgid "%s posted an update." msgid "%s posted an update."
msgstr "" msgstr ""