From 61a0f9c196e61342bdca56d9283ea66e66b82bd6 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 28 Apr 2013 04:30:20 -0700 Subject: [PATCH] bug #540 and hush up a couple of log messages that are way too verbose --- boot.php | 2 +- include/items.php | 2 +- object/Item.php | 2 +- util/messages.po | 10 +++++----- view/theme/diabook/templates/wall_thread.tpl | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/boot.php b/boot.php index 6a273d9cc9..070ddd64d6 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.1681' ); +define ( 'FRIENDICA_VERSION', '3.1.1684' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1163 ); define ( 'EOL', "
\r\n" ); diff --git a/include/items.php b/include/items.php index 194e19b5c0..f4f972e72d 100755 --- a/include/items.php +++ b/include/items.php @@ -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(); diff --git a/object/Item.php b/object/Item.php index 575a28f58f..ae4d26cc10 100644 --- a/object/Item.php +++ b/object/Item.php @@ -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; } diff --git a/util/messages.po b/util/messages.po index 370cd01015..17ef89bf2b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -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 \n" "Language-Team: LANGUAGE \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" 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 "" diff --git a/view/theme/diabook/templates/wall_thread.tpl b/view/theme/diabook/templates/wall_thread.tpl index be143cfbaa..8c4dd450d7 100644 --- a/view/theme/diabook/templates/wall_thread.tpl +++ b/view/theme/diabook/templates/wall_thread.tpl @@ -75,11 +75,11 @@ {{if $item.vote.dislike}} {{/if}} - {{/if}} - {{if $item.vote.share}} + {{if $item.vote.share}} - {{/if}} + {{/if}} + {{/if}} {{if $item.star}}