Merge remote-tracking branch 'upstream/master' into ofaj-22174

assets/vue/views/documents/DocumentsList.vue

@@ -179,12 +179,14 @@
             icon="folder-move"
             size="small"
             type="secondary"
+            :title="t('Move')"
             @click="openMoveDialog(slotProps.data)"
           />
           <BaseButton
             icon="information"
             size="small"
             type="primary"
+            :title="t('Information')"
             @click="btnShowInformationOnClick(slotProps.data)"
           />
 
@@ -199,6 +201,7 @@
             "
             size="small"
             type="secondary"
+            :title="t('Visibility')"
             @click="btnChangeVisibilityOnClick(slotProps.data)"
           />
 
@@ -207,6 +210,7 @@
             icon="edit"
             size="small"
             type="secondary"
+            :title="t('Edit')"
             @click="btnEditOnClick(slotProps.data)"
           />
 
@@ -215,6 +219,7 @@
             icon="delete"
             size="small"
             type="danger"
+            :title="t('Delete')"
             @click="confirmDeleteItem(slotProps.data)"
           />
           <BaseButton
@@ -223,6 +228,7 @@
             :icon="slotProps.data.iid === defaultCertificateId ? 'certificate-selected' : 'certificate-not-selected'"
             size="small"
             type="slotProps.data.iid === defaultCertificateId ? 'success' : 'black'"
+            :title="t('Set as default certificate')"
             @click="selectAsDefaultCertificate(slotProps.data)"
           />
           <BaseButton
@@ -230,6 +236,7 @@
             :icon="getTemplateIcon(slotProps.data.iid)"
             size="small"
             type="secondary"
+            :title="t('Template options')"
             @click="openTemplateForm(slotProps.data.iid)"
           />
         </div>

src/CoreBundle/Migrations/Schema/V200/Version20201216110722.php

@@ -88,9 +88,10 @@ final class Version20201216110722 extends AbstractMigrationChamilo
         }
         // Restoring attendance title and resource_node title
         foreach ($attendancesBackup as $attendance) {
-            $sqlRestoreAttendance = "UPDATE c_attendance SET title = '{$attendance['title']}' where iid = {$attendance['iid']}";
+            $titleForDatabase = Database::escape_string($attendance['title']);
+            $sqlRestoreAttendance = "UPDATE c_attendance SET title = '{$titleForDatabase}' where iid = {$attendance['iid']}";
             $resultUpdate = $this->connection->executeQuery($sqlRestoreAttendance);
-            $sqlUpdateResourceNode = "UPDATE resource_node SET title = '{$attendance['title']}' where id in (SELECT resource_node_id FROM c_attendance where iid = {$attendance['iid']})";
+            $sqlUpdateResourceNode = "UPDATE resource_node SET title = '{$titleForDatabase}' where id in (SELECT resource_node_id FROM c_attendance where iid = {$attendance['iid']})";
             $resultUpdate = $this->connection->executeQuery($sqlUpdateResourceNode);
         }
     }