Merge branch 'wip-MDL-32106-master' of git://github.com/marinaglancy/moodle

2012-03-27 10:10:05 +08:00
parent 1cc4412c89 400d228e51
commit f3810b2ee2
1 changed files with 3 additions and 3 deletions
@@ -669,13 +669,13 @@ M.core_filepicker.init = function(Y, options) {
                    params['author'] = author.get('value');
                }

-                if (this.options.env == 'editor') {
+                if (this.options.externallink && this.options.env == 'editor') {
                    // in editor, images are stored in '/' only
                    params.savepath = '/';
                    // when image or media button is clicked
                    if ( this.options.return_types != 1 ) {
-                        var linkexternal = Y.one('#linkexternal-'+client_id).get('checked');
-                        if (linkexternal) {
+                        var linkexternal = Y.one('#linkexternal-'+client_id);
+                        if (linkexternal && linkexternal.get('checked')) {
                            params['linkexternal'] = 'yes';
                        }
                    } else {