friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

don't try to parse empty xml with simplepie, throws conversion warning

This commit is contained in:
friendica 2013-06-12 21:41:07 -07:00
parent 8fe82d35d4
commit 2464915817
3 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -12,7 +12,7 @@ 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.1714' ); define ( 'FRIENDICA_VERSION', '3.1.1729' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1163 ); define ( 'DB_UPDATE_VERSION', 1163 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );

3
include/Scrape.php
View File

@ -624,7 +624,8 @@ function probe_url($url, $mode = PROBE_NORMAL) {
logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), LOGGER_DATA); logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), LOGGER_DATA);
$feed->set_raw_data($xml); // Don't try and parse an empty string
$feed->set_raw_data(($xml) ? $xml : '<?xml version="1.0" encoding="utf-8" ?><xml></xml>');
$feed->init(); $feed->init();
if($feed->error()) if($feed->error())

71
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.1.1714\n" "Project-Id-Version: 3.1.1729\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-28 00:01-0700\n" "POT-Creation-Date: 2013-06-12 00:01-0700\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"
@ -401,7 +401,8 @@ msgstr ""
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
#: ../../include/bbcode.php:210 ../../include/bbcode.php:549 #: ../../include/bbcode.php:210 ../../include/bbcode.php:550
#: ../../include/bbcode.php:551
msgid "Image/photo" msgid "Image/photo"
msgstr "" msgstr ""
@ -416,7 +417,7 @@ msgstr ""
msgid "$1 wrote:" msgid "$1 wrote:"
msgstr "" msgstr ""
#: ../../include/bbcode.php:557 ../../include/bbcode.php:558 #: ../../include/bbcode.php:559 ../../include/bbcode.php:560
msgid "Encrypted content" msgid "Encrypted content"
msgstr "" msgstr ""
@ -594,7 +595,7 @@ msgstr ""
msgid "An error occurred during registration. Please try again." msgid "An error occurred during registration. Please try again."
msgstr "" msgstr ""
#: ../../include/user.php:237 ../../include/text.php:1594 #: ../../include/user.php:237 ../../include/text.php:1596
msgid "default" msgid "default"
msgstr "" msgstr ""
@ -924,7 +925,7 @@ msgstr ""
msgid "Sharing notification from Diaspora network" msgid "Sharing notification from Diaspora network"
msgstr "" msgstr ""
#: ../../include/diaspora.php:1874 ../../include/text.php:1860 #: ../../include/diaspora.php:1874 ../../include/text.php:1862
#: ../../include/conversation.php:126 ../../include/conversation.php:254 #: ../../include/conversation.php:126 ../../include/conversation.php:254
#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151 #: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
#: ../../view/theme/diabook/theme.php:464 #: ../../view/theme/diabook/theme.php:464
@ -1358,123 +1359,123 @@ msgstr ""
msgid "surprised" msgid "surprised"
msgstr "" msgstr ""
#: ../../include/text.php:1161 #: ../../include/text.php:1163
msgid "Monday" msgid "Monday"
msgstr "" msgstr ""
#: ../../include/text.php:1161 #: ../../include/text.php:1163
msgid "Tuesday" msgid "Tuesday"
msgstr "" msgstr ""
#: ../../include/text.php:1161 #: ../../include/text.php:1163
msgid "Wednesday" msgid "Wednesday"
msgstr "" msgstr ""
#: ../../include/text.php:1161 #: ../../include/text.php:1163
msgid "Thursday" msgid "Thursday"
msgstr "" msgstr ""
#: ../../include/text.php:1161 #: ../../include/text.php:1163
msgid "Friday" msgid "Friday"
msgstr "" msgstr ""
#: ../../include/text.php:1161 #: ../../include/text.php:1163
msgid "Saturday" msgid "Saturday"
msgstr "" msgstr ""
#: ../../include/text.php:1161 #: ../../include/text.php:1163
msgid "Sunday" msgid "Sunday"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1167
msgid "January" msgid "January"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1167
msgid "February" msgid "February"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1167
msgid "March" msgid "March"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1167
msgid "April" msgid "April"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1167
msgid "May" msgid "May"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1167
msgid "June" msgid "June"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1167
msgid "July" msgid "July"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1167
msgid "August" msgid "August"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1167
msgid "September" msgid "September"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1167
msgid "October" msgid "October"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1167
msgid "November" msgid "November"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1167
msgid "December" msgid "December"
msgstr "" msgstr ""
#: ../../include/text.php:1321 ../../mod/videos.php:301 #: ../../include/text.php:1323 ../../mod/videos.php:301
msgid "View Video" msgid "View Video"
msgstr "" msgstr ""
#: ../../include/text.php:1353 #: ../../include/text.php:1355
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: ../../include/text.php:1377 ../../include/text.php:1389 #: ../../include/text.php:1379 ../../include/text.php:1391
msgid "Click to open/close" msgid "Click to open/close"
msgstr "" msgstr ""
#: ../../include/text.php:1551 ../../mod/events.php:335 #: ../../include/text.php:1553 ../../mod/events.php:335
msgid "link to source" msgid "link to source"
msgstr "" msgstr ""
#: ../../include/text.php:1606 #: ../../include/text.php:1608
msgid "Select an alternate language" msgid "Select an alternate language"
msgstr "" msgstr ""
#: ../../include/text.php:1858 ../../include/conversation.php:118 #: ../../include/text.php:1860 ../../include/conversation.php:118
#: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456 #: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
msgid "event" msgid "event"
msgstr "" msgstr ""
#: ../../include/text.php:1862 #: ../../include/text.php:1864
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: ../../include/text.php:1864 ../../mod/content.php:628 #: ../../include/text.php:1866 ../../mod/content.php:628
#: ../../object/Item.php:364 ../../object/Item.php:377 #: ../../object/Item.php:364 ../../object/Item.php:377
msgid "comment" msgid "comment"
msgid_plural "comments" msgid_plural "comments"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../include/text.php:1865 #: ../../include/text.php:1867
msgid "post" msgid "post"
msgstr "" msgstr ""
#: ../../include/text.php:2020 #: ../../include/text.php:2022
msgid "Item filed" msgid "Item filed"
msgstr "" msgstr ""