Merge branch 'pull'

diff --git a/boot.php b/boot.php
index 1c4fc6300069aef5aa3cc18ca1810e91af1b8109..673623fafc318eba1bbc13012a415b0faf16fca5 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1012' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1013' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1063      );
 

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 61c80702efb4c4f68dc2a78e82ccffcd87c7c42e..bf2dde8e9b0452cc41a59a10f8127b0344b06e53 100644 (file)
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -114,10 +114,12 @@ tinyMCE.init({
 
                $('.item-select').each( function() {
                        if($(this).is(':checked')) {
-                               if(checkedstr.length != 0)
+                               if(checkedstr.length != 0) {
                                        checkedstr = checkedstr + ',' + $(this).val();
-                               else
+                               }
+                               else {
                                        checkedstr = $(this).val();
+                               }
                        }       
                });
                $.post('item', { dropitems: checkedstr }, function(data) {