friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

bug #540 and hush up a couple of log messages that are way too verbose

pull/670/merge
friendica 2013-04-28 04:30:20 -07:00
parent 1ed6a2bd3d
commit 61a0f9c196
5 changed files with 11 additions and 11 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');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.1.1681' );
define ( 'FRIENDICA_VERSION', '3.1.1684' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1163 );
define ( 'EOL', "<br />\r\n" );

2
include/items.php
View File

@ -294,7 +294,7 @@ function construct_activity_target($item) {
if(! function_exists('limit_body_size')) {
function limit_body_size($body) {
logger('limit_body_size: start', LOGGER_DEBUG);
// logger('limit_body_size: start', LOGGER_DEBUG);
$maxlen = get_max_import_size();

2
object/Item.php
View File

@ -529,7 +529,7 @@ class Item extends BaseObject {
*/
public function get_data_value($name) {
if(!isset($this->data[$name])) {
logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
// logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
return false;
}

10
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 3.1.1681\n"
"Project-Id-Version: 3.1.1684\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-25 00:02-0700\n"
"POT-Creation-Date: 2013-04-28 00:02-0700\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"
@ -1086,7 +1086,7 @@ msgstr ""
msgid " on Last.fm"
msgstr ""
#: ../../include/bbcode.php:210 ../../include/bbcode.php:545
#: ../../include/bbcode.php:210 ../../include/bbcode.php:549
msgid "Image/photo"
msgstr ""
@ -1097,11 +1097,11 @@ msgid ""
"href=\"%s\" target=\"external-link\">post</a>"
msgstr ""
#: ../../include/bbcode.php:510 ../../include/bbcode.php:530
#: ../../include/bbcode.php:514 ../../include/bbcode.php:534
msgid "$1 wrote:"
msgstr ""
#: ../../include/bbcode.php:553 ../../include/bbcode.php:554
#: ../../include/bbcode.php:557 ../../include/bbcode.php:558
msgid "Encrypted content"
msgstr ""

6
view/theme/diabook/templates/wall_thread.tpl
View File

@ -75,11 +75,11 @@
{{if $item.vote.dislike}}
<a href="#" id="dislike-{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
{{/if}}
{{/if}}
{{if $item.vote.share}}
{{if $item.vote.share}}
<a href="#" id="share-{{$item.id}}" class="icon recycle" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>
{{/if}}
{{/if}}
{{/if}}
{{if $item.star}}