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

diff --git a/boot.php b/boot.php
index 6a273d9cc90685548a8536b0e6c719933bac05aa..070ddd64d6527e29666cce016c2b3653a6be65c7 100644 (file)
--- 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',                    "<br />\r\n"     );

diff --git a/include/items.php b/include/items.php
index 194e19b5c01dad61bfc1c761a48536973b0133f7..f4f972e72d933f8518fc1689e13e2dbf2870b408 100755 (executable)
--- 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 575a28f58fdfcd63c16fc6d7d1f7d20d83897bfd..ae4d26cc1073a56c7524dea931d3a3920a8f411c 100644 (file)
--- 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 370cd0101522af1c47d7128505c4368a08f2a8fa..17ef89bf2bd59513364b484d8f97b2600b4079ec 100644 (file)
--- 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 <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 ""
 

diff --git a/view/theme/diabook/templates/wall_thread.tpl b/view/theme/diabook/templates/wall_thread.tpl
index be143cfbaad5d1394354fe6dba165d5de36db242..8c4dd450d7ba7e65d69fe3995ec8b23832e57b3f 100644 (file)
--- a/view/theme/diabook/templates/wall_thread.tpl
+++ b/view/theme/diabook/templates/wall_thread.tpl
@@ -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}}