jenkins-bot has submitted this change and it was merged.

Change subject: Fix error message in set user options fail
......................................................................


Fix error message in set user options fail

* Write error.info instead of "[object Object]" into console.
* Avoid accessing result.error when not defined.

Bug: T119809
Change-Id: I23a124cbaf8ef9376c4c6071dec4d7e846f1eabe
---
M modules/jquery.codeEditor.js
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  TheDJ: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index b640978..ddb2797 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -299,7 +299,11 @@
                                        optionname: 'usecodeeditor',
                                        optionvalue: prefValue ? 1 : 0
                                } ).fail( function ( code, result ) {
-                                       mw.log.warn( 'Failed to set code editor 
preference: ' + code + '\n' + result.error );
+                                       var message = 'Failed to set code 
editor preference: ' + code;
+                                       if ( result.error && result.error.info 
) {
+                                               message += '\n' + 
result.error.info;
+                                       }
+                                       mw.log.warn( message );
                                } );
                        },
                        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/255911
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I23a124cbaf8ef9376c4c6071dec4d7e846f1eabe
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
Gerrit-Reviewer: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to