Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19

12 years ago · bf8d97c7ea
parent a33e870d94 5845336695
commit bf8d97c7ea
2 changed files with 9 additions and 1 deletions
--- a/main/document/document.php
+++ b/main/document/document.php
@ -1187,6 +1187,7 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
        GroupManager :: is_tutor_of_group(api_get_user_id(), api_get_group_id()))
    ) {
        $count = 1;
+        $countedPaths = array();
        foreach ($docs_and_folders as $key => $document_data) {
            $row = array();
            $row['id'] = $document_data['id'];
@ -1272,7 +1273,10 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
            $row[] = $size;
            $row[] = $document_name;

-            $total_size = $total_size + $size;
+            if (!isset($countedPaths[$document_data['path']])) {
+                $total_size = $total_size + $size;
+                $countedPaths[$document_data['path']] = true;
+            }

            if ((isset($_GET['keyword']) && search_keyword($document_name, $_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])) {
                $sortable_data[] = $row;
--- a/main/inc/lib/fckeditor/editor/plugins/MP3/fck_mp3.php
+++ b/main/inc/lib/fckeditor/editor/plugins/MP3/fck_mp3.php
@ -2,6 +2,10 @@
 // name of the language file that needs to be included
 $language_file = array('resourcelinker','document');
 include('../../../../../../inc/global.inc.php');
+
+// Disabling access for anonymous users.
+api_block_anonymous_users();
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>