Merge branch 'SilverYoCha-feature-9331'

Author: NicolasEYSSERIC

gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeleteMediaDataProcess.java

@@ -103,7 +103,9 @@ private void removeXMLContentOfMedia(final String mediaId,
 
         final RecordSet set = pubTemplate.getRecordSet();
         final DataRecord data = set.getRecord(mediaId);
-        set.delete(data.getId());
+        if (data != null) {
+          set.delete(data.getId());
+        }
       }
     } catch (final PublicationTemplateException | FormException e) {
       throw new GalleryRuntimeException(e);

infoLetter/infoLetter-war/src/main/webapp/wysiwyg/jsp/ckeditor/infoLetterConfig.js

@@ -14,6 +14,7 @@ CKEDITOR.editorConfig = function( config )
   config.filebrowserImageBrowseUrl = config.baseHref+'uploadFile.jsp';
   config.filebrowserFlashBrowseUrl = config.baseHref+'uploadFile.jsp';
   config.filebrowserBrowseUrl = config.baseHref+'uploadFile.jsp';
+  config.imageUploadUrl = 'activated';
   config.extraPlugins = 'userzoom,identitycard,allmedias,autolink,video,html5audio,imageresizerowandcolumn,variables,listblock,floatpanel,richcombo,mediaofcontribution,imagebank,filebank';
   config.allowedContent = true;
   config.toolbarCanCollapse = true;

kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/control/KmeliaSessionController.java

@@ -3786,7 +3786,13 @@ public void saveXMLFormToPublication(PublicationDetail pubDetail, List<FileItem>
         context.setNodeId(getCurrentFolderId());
       }
       context.setObjectId(pubId);
-      context.setContentLanguage(getContentLanguage());
+      if (forceUpdatePublication) {
+        // case of a modification of the publication
+        context.setContentLanguage(getContentLanguage());
+      } else {
+        // the publication is just created
+        context.setContentLanguage(pubDetail.getLanguage());
+      }
 
       form.update(items, data, context);
       set.save(data);

kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationManager.jsp

@@ -262,6 +262,7 @@
     <view:looknfeel withFieldsetStyle="true" withCheckFormScript="true"/>
     <view:includePlugin name="datepicker"/>
     <view:includePlugin name="popup"/>
+    <view:includePlugin name="wysiwyg"/>
     <script type="text/javascript" src="<%=m_context%>/util/javaScript/i18n.js"></script>
 
     <% if (extraForm != null) { %>