diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-11-09 14:32:24 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-11-09 14:32:24 +0100 |
| commit | 5739317567f45895c8c9b5183c8db2886daf9872 (patch) | |
| tree | 391247c540fbbefc7416410aa46e801dfbcd99bf /phpBB | |
| parent | d8760568b6c13498f8bf26eb19d0a64af6373ff5 (diff) | |
| parent | 671598656c8f04c8d072835b0fe26d12ca564067 (diff) | |
| download | forums-5739317567f45895c8c9b5183c8db2886daf9872.tar forums-5739317567f45895c8c9b5183c8db2886daf9872.tar.gz forums-5739317567f45895c8c9b5183c8db2886daf9872.tar.bz2 forums-5739317567f45895c8c9b5183c8db2886daf9872.tar.xz forums-5739317567f45895c8c9b5183c8db2886daf9872.zip | |
Merge pull request #4023 from CHItA/ticket/14277
[ticket/14277] Fix undefined index error in migrations
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/installer.js | 14 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/tool/module.php | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/installer.js b/phpBB/assets/javascript/installer.js index e61adc7f99..4fc2e55b66 100644 --- a/phpBB/assets/javascript/installer.js +++ b/phpBB/assets/javascript/installer.js @@ -243,8 +243,20 @@ */ function parseMessage(messageJSON) { $('#loading_indicator').css('display', 'none'); + var responseObject; - var responseObject = JSON.parse(messageJSON); + try { + responseObject = JSON.parse(messageJSON); + } catch (err) { + if (window.console) { + console.log('Failed to parse JSON object\n\nMessage: ' + err.message + '\n\nServer Response: ' + messageJSON); + } else { + alert('Failed to parse JSON object\n\nMessage: ' + err.message + '\n\nServer Response: ' + messageJSON); + } + + resetPolling(); + return; + } // Parse object if (responseObject.hasOwnProperty('errors')) { diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php index 69ac71abb7..a5ed62fd65 100644 --- a/phpBB/phpbb/db/migration/tool/module.php +++ b/phpBB/phpbb/db/migration/tool/module.php @@ -262,7 +262,7 @@ class module implements \phpbb\db\migration\tool\tool_interface // Success $module_log_name = ((isset($this->user->lang[$data['module_langname']])) ? $this->user->lang[$data['module_langname']] : $data['module_langname']); - $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_MODULE_ADD', false, array($module_log_name)); + $phpbb_log->add('admin', (isset($user->data['user_id'])) ? $user->data['user_id'] : ANONYMOUS, $user->ip, 'LOG_MODULE_ADD', false, array($module_log_name)); // Move the module if requested above/below an existing one if (isset($data['before']) && $data['before']) |