Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into 1.11.x

8 years ago · dc5ddfaeb5
parent 134aa8ed4b f6eea18507
commit dc5ddfaeb5
3 changed files with 15 additions and 17 deletions
--- a/main/inc/lib/pear/HTML/QuickForm/file.php
+++ b/main/inc/lib/pear/HTML/QuickForm/file.php
@ -257,7 +257,7 @@ class HTML_QuickForm_file extends HTML_QuickForm_input
            $ratio = 'aspectRatio: '.$param['ratio'].',';
        }
        $scalable = 'false';
-        if (!empty($param['scalable'])) {
+        if (!empty($param['scalable']) && $param['scalable'] != 'false') {
            $ratio = '';
            $scalable = $param['scalable'];
        }
--- a/main/template/default/session/about.tpl
+++ b/main/template/default/session/about.tpl
@ -271,6 +271,4 @@
            </div>
        </div>
    {% endfor %}
-
-
 </div>