makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14492] Update phpBB version and fix miscellaneous code issues

Browse source 
PHPBB3-14492
This commit is contained in:
Marc Alexander 2016-08-22 20:59:57 +02:00
parent 1f27097208
commit b9c284d85b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/build.xml
View file

@ -291,7 +291,7 @@
<!-- Checkout latest viglink to ext folder --> <!-- Checkout latest viglink to ext folder -->
<available file="${dir}/ext" type="dir" property="add-viglink-ext" /> <available file="${dir}/ext" type="dir" property="add-viglink-ext" />
<exec dir="${dir}" <exec dir="${dir}"
command='php -r "echo version_compare(&apos;${version}&apos;, &apos;3.2.0-b3&apos;, &apos;>=&apos;) ? &apos;true&apos; : &apos;false&apos;;"' command='php -r "echo version_compare(&apos;${version}&apos;, &apos;3.2.0-RC2&apos;, &apos;>=&apos;) ? &apos;true&apos; : &apos;false&apos;;"'
checkreturn="true" checkreturn="true"
outputProperty='viglink-available' /> outputProperty='viglink-available' />
<if> <if>

2
phpBB/includes/acp/acp_help_phpbb.php
View file

@ -72,7 +72,7 @@ class acp_help_phpbb
$collector->add_data_provider(new phpbb_questionnaire_phpbb_data_provider($config)); $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 * @event core.acp_help_phpbb_submit_before
* @var boolean submit Do we display the form or process the submission * @var boolean submit Do we display the form or process the submission

3
phpBB/phpbb/install/module/update_database/task/update_extensions.php
View file

@ -176,7 +176,8 @@ class update_extensions extends task_base
// Create log // Create log
$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_UPDATE', time(), array($ext_name)); $this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_UPDATE', time(), array($ext_name));
$this->iohandler->add_success_message(array('CLI_EXTENSION_UPDATE_SUCCESS', $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)); $this->iohandler->add_log_message('CLI_EXTENSION_UPDATE_FAILURE', array($ext_name));
} }