diff --git a/main/document/document.php b/main/document/document.php
index 5943b13800..fa9a3486e6 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -269,7 +269,7 @@ if (isset($_GET['curdirpath']) && $_GET['curdirpath'] == '/certificates' && isse
         // Generate document HTML        
         $content_html = DocumentManager::replace_user_info_into_html(api_get_user_id(), api_get_course_id(), true);
 
-        $new_content_html = $content_html['html_content'];
+        $new_content_html = $content_html['content'];
 
         $path_image = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/images/gallery';
         $new_content_html = str_replace('../images/gallery', $path_image, $new_content_html);
diff --git a/main/gradebook/index.php b/main/gradebook/index.php
index 967663359c..0bee9bc815 100755
--- a/main/gradebook/index.php
+++ b/main/gradebook/index.php
@@ -681,7 +681,7 @@ if (isset($_GET['cidReq']) && $_GET['cidReq']!='') {
 } else {
 	$addparams['cidReq']='';
 }
-$gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
+$gradebooktable = new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
 $no_qualification = false;
 if (( count($allcat) == 0) && ( count($alleval) == 0 ) && ( count($alllink) == 0 )) {
     $no_qualification = true;
diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php
index beff22e98f..28daef8a15 100755
--- a/main/gradebook/lib/fe/gradebooktable.class.php
+++ b/main/gradebook/lib/fe/gradebooktable.class.php
@@ -200,7 +200,7 @@ class GradebookTable extends SortableTable {
 
 				$content_html = DocumentManager::replace_user_info_into_html(api_get_user_id(), $course_code);
 				
-				$new_content = explode('</head>',$content_html['html_content']);
+				$new_content = explode('</head>',$content_html['content']);
 
 				if (empty($new_content[0])) {
 					$warning_message = get_lang('ThereIsNotACertificateAvailableByDefault');
diff --git a/main/gradebook/lib/gradebook_functions.inc.php b/main/gradebook/lib/gradebook_functions.inc.php
index b06bcbe0f9..86161f413f 100755
--- a/main/gradebook/lib/gradebook_functions.inc.php
+++ b/main/gradebook/lib/gradebook_functions.inc.php
@@ -563,7 +563,7 @@ function get_user_certificate_content($user_id, $course_code, $is_preview = fals
     //generate document HTML    
     $content_html       = DocumentManager::replace_user_info_into_html($user_id, $course_code, $is_preview);
         
-    $new_content        = explode('</head>', $content_html['html_content']);    
+    $new_content        = explode('</head>', $content_html['content']);    
     $new_content_html   = $new_content[1];                    
     $path_image         = api_get_path(WEB_COURSE_PATH).api_get_course_path($course_code).'/document/images/gallery';
     $new_content_html   = str_replace('../images/gallery',$path_image,$new_content_html);
diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php
index 018d955dda..fe6b21ee4f 100755
--- a/main/inc/lib/document.lib.php
+++ b/main/inc/lib/document.lib.php
@@ -1357,7 +1357,7 @@ return 'application/octet-stream';
             $info_to_replace_in_content_html=$all_user_info[1];
             $new_content=str_replace($info_to_be_replaced_in_content_html,$info_to_replace_in_content_html, $my_content_html);
         }
-        return array('html_content' => $new_content, 'variables' => $all_user_info);
+        return array('content' => $new_content, 'variables' => $all_user_info);
     }
 
     /**