Merge "Bug 1732810: Pass file's title to pdfjs download button"

htdocs/artefact/file/blocktype/pdf/lib.php

@@ -70,6 +70,9 @@ class PluginBlocktypePdf extends MaharaCoreBlocktype {
                     }
                 }
             }
+            else if ($language == 'en') {
+                $language = 'en-GB';
+            }
             $result = '<iframe src="' . $urlbase . 'artefact/file/blocktype/pdf/viewer.php?editing=' . $editing . '&ingroup=' . !empty($group) . '&file=' . $artefactid . '&lang=' . $language . '&view=' . $instance->get('view')
                  . '" width="100%" height="500" frameborder="0"></iframe>';
 

htdocs/artefact/file/blocktype/pdf/viewer.php

@@ -48,6 +48,6 @@ if (get_config('cleanurls') && get_config('cleanurlusersubdomains') && !$editing
 }
 
 $smarty = smarty();
-$smarty->assign('url', $urlbase . 'artefact/file/download.php?file='.$fileid.'&view='.$viewid);
+$smarty->assign('url', $urlbase . 'artefact/file/download.php?file='.$fileid.'&view='.$viewid.'&title='.urlencode($file->get('title')));
 $smarty->assign('title', $file->get('title'));
 $smarty->display('blocktype:pdf:pdf.tpl');