| Index: branches/wmf/1.18wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js |
| — | — | @@ -2548,7 +2548,12 @@ |
| 2549 | 2549 | } else { |
| 2550 | 2550 | var msg; |
| 2551 | 2551 | if ( 'error' in data ) { |
| 2552 | | - msg = mw.msg( data.error ); |
| | 2552 | + if ( typeof( data.error ) == 'object' ) { |
| | 2553 | + msg = data.error; |
| | 2554 | + } else { |
| | 2555 | + msg = mw.msg( data.error ); |
| | 2556 | + } |
| | 2557 | + aft5_debug( data.error ); |
| 2553 | 2558 | } else { |
| 2554 | 2559 | msg = { info: mw.msg( 'articlefeedbackv5-error-unknown' ) }; |
| 2555 | 2560 | } |
| Property changes on: branches/wmf/1.18wmf1/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2556 | 2561 | Merged /trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5.php:r108658-108665 |
| Property changes on: branches/wmf/1.18wmf1/extensions/ArticleFeedbackv5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2557 | 2562 | Merged /trunk/extensions/ArticleFeedbackv5:r108658-108665 |