upgrade 1.1.2 pour XML, MySql et SQLite

[mw_sourceml] / app / controllers / users / morceaux.php

diff --git a/app/controllers/users/morceaux.php b/app/controllers/users/morceaux.php
index 9c3adda..092da62 100644 (file)
--- a/app/controllers/users/morceaux.php
+++ b/app/controllers/users/morceaux.php
@@ -218,6 +218,8 @@
           );
           $source_infos["date_creation"] = $_POST["annee_date_creation"]."-".$_POST["mois_date_creation"]."-".$_POST["jour_date_creation"];
           $source_infos["description"] = $_POST["description"];
+          $morceau["description"] = $source_infos["description"];
+          $morceau["date_creation"] = $source_infos["date_creation"];
           foreach($_POST as $post_key => $post_value){
             if(substr($post_key, 0, 13) == "document_nom_"){
               if($id_document = substr($post_key, 13)){
@@ -241,7 +243,7 @@
                 $morceau["groupes"],
                 $morceau["titre"],
                 $this->morceau_status_id,
-                $morceau["licence"]["id"],
+                isset($morceau["licence"]["id"]) ? $morceau["licence"]["id"] : null,
                 $morceau["documents"],
                 $morceau["reference"],
                 $morceau["derivations"],
@@ -328,6 +330,10 @@
           "date_inscription" => $_POST["date_inscription"],
           "ordre" => isset($morceau["ordre"]) ? $morceau["ordre"] : 0
         );
+        $permissions = $morceau["permissions"];
+        $image = isset($morceau["image"]) ? $morceau["image"] : null;
+        $image_uri = isset($morceau["image_uri"]) ? $morceau["image_uri"] : null;
+        $image_uri = $morceau["image_uri"];
         $morceau = $data->empty_source(
           array(
             "id" => $morceau["id"],
@@ -335,6 +341,10 @@
             "image" => isset($morceau["image"]) ? $morceau["image"] : ""
           )
         );
+        $morceau["permissions"] = $permissions;
+        $morceau["date_creation"] = $_POST["annee_date_creation"]."-".$_POST["mois_date_creation"]."-".$_POST["jour_date_creation"];
+        $morceau["image"] = $image;
+        $morceau["image_uri"] = $image_uri;
         $users_sources_mod = $env->get_controller("users/sources");
         if($_POST["album"]){
           if($album = $data->source($_POST["album"], true)){
@@ -380,6 +390,7 @@
             ),
             isset($_POST["use_edit_reference_content"]) ? true : false
           );
+          $morceau["licence"]["id"] = 0;
         }
         else{
           if(!($morceau["titre"] = trim($_POST["titre"]))){
@@ -390,6 +401,7 @@
           );
           $source_infos["date_creation"] = $_POST["annee_date_creation"]."-".$_POST["mois_date_creation"]."-".$_POST["jour_date_creation"];
           $source_infos["description"] = $_POST["description"];
+          $morceau["description"] = $source_infos["description"];
           foreach($_POST as $post_key => $post_value){
             if(substr($post_key, 0, 13) == "document_nom_"){
               if($id_document = substr($post_key, 13)){