diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-08-22 20:59:57 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-03 14:23:34 +0100 |
| commit | b9c284d85be82e2a8f50c20e147d1ca2352453d4 (patch) | |
| tree | b7a907c812cca71d4ced9c931e11f303c5bbcbf4 | |
| parent | 1f270972084cd228e135481b766ada9941582155 (diff) | |
| download | forums-b9c284d85be82e2a8f50c20e147d1ca2352453d4.tar forums-b9c284d85be82e2a8f50c20e147d1ca2352453d4.tar.gz forums-b9c284d85be82e2a8f50c20e147d1ca2352453d4.tar.bz2 forums-b9c284d85be82e2a8f50c20e147d1ca2352453d4.tar.xz forums-b9c284d85be82e2a8f50c20e147d1ca2352453d4.zip | |
[ticket/14492] Update phpBB version and fix miscellaneous code issues
PHPBB3-14492
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_help_phpbb.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/update_database/task/update_extensions.php | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index 69ecaa896c..4fe6e0e908 100644 --- a/build/build.xml +++ b/build/build.xml @@ -291,7 +291,7 @@ <!-- Checkout latest viglink to ext folder --> <available file="${dir}/ext" type="dir" property="add-viglink-ext" /> <exec dir="${dir}" - command='php -r "echo version_compare('${version}', '3.2.0-b3', '>=') ? 'true' : 'false';"' + command='php -r "echo version_compare('${version}', '3.2.0-RC2', '>=') ? 'true' : 'false';"' checkreturn="true" outputProperty='viglink-available' /> <if> diff --git a/phpBB/includes/acp/acp_help_phpbb.php b/phpBB/includes/acp/acp_help_phpbb.php index cc353376cd..89f2f3d160 100644 --- a/phpBB/includes/acp/acp_help_phpbb.php +++ b/phpBB/includes/acp/acp_help_phpbb.php @@ -72,7 +72,7 @@ class acp_help_phpbb $collector->add_data_provider(new phpbb_questionnaire_phpbb_data_provider($config)); /** - * Event to add and/or modify acp_board configurations + * Event to modify ACP help phpBB page and/or listen to submit * * @event core.acp_help_phpbb_submit_before * @var boolean submit Do we display the form or process the submission diff --git a/phpBB/phpbb/install/module/update_database/task/update_extensions.php b/phpBB/phpbb/install/module/update_database/task/update_extensions.php index 76904f80f1..01b88344e8 100644 --- a/phpBB/phpbb/install/module/update_database/task/update_extensions.php +++ b/phpBB/phpbb/install/module/update_database/task/update_extensions.php @@ -176,7 +176,8 @@ class update_extensions extends task_base // Create log $this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_UPDATE', time(), array($ext_name)); $this->iohandler->add_success_message(array('CLI_EXTENSION_UPDATE_SUCCESS', $ext_name)); - } else + } + else { $this->iohandler->add_log_message('CLI_EXTENSION_UPDATE_FAILURE', array($ext_name)); } |