diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 10:36:14 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 10:36:14 +0100 |
| commit | 6806484c1632a6be51dfc536fd9285dfb1ad7359 (patch) | |
| tree | 164e9145b86870a227f95466448db4185a055266 /core/js/js.js | |
| parent | b5d1dfcdc91e9192b50752714b5beeda49bbeadf (diff) | |
| parent | 934d9dcc42e2d7281e04c6acecdd53ae2a03b25f (diff) | |
| download | nextcloud-server-6806484c1632a6be51dfc536fd9285dfb1ad7359.tar.gz nextcloud-server-6806484c1632a6be51dfc536fd9285dfb1ad7359.zip | |
Merge branch 'master' into fixing-998-master
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/js/js.js b/core/js/js.js index b57603b7b2f..4e35547c058 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -3,14 +3,15 @@ * Add * define('DEBUG', true); * To the end of config/config.php to enable debug mode. + * The undefined checks fix the broken ie8 console */ -if (oc_debug !== true) { +if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") { if (!window.console) { window.console = {}; } var methods = ['log', 'debug', 'warn', 'info', 'error', 'assert']; for (var i = 0; i < methods.length; i++) { - console[methods[i]] = function () { }; + console[methods[i]] = function () { }; } } @@ -20,7 +21,6 @@ if (oc_debug !== true) { * @param text the string to translate * @return string */ - function t(app,text, vars){ if( !( t.cache[app] )){ $.ajax(OC.filePath('core','ajax','translations.php'),{ |