Merge branch 'wip-MDL-32106-MOODLE_21_STABLE' of git://github.com/mar…

…inaglancy/moodle into MOODLE_21_STABLE
moodle · Mar 27, 2012 · 3d06074 · 3d06074
2 parents 77c5c20 + 1d0ac18
commit 3d06074
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/repository/filepicker.js b/repository/filepicker.js
@@ -657,13 +657,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 {