mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-20 01:59:22 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/13553] Add a method to the controller helper to display a message
  [prep-release-3.1.3] Add changelog for 3.1.3-RC1
  [prep-release-3.1.3] Prepare Changelog
  [prep-release-3.1.3] Add migration for 3.1.3-RC1
  [prep-release-3.1.3] Update version to 3.1.2-RC1

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
This commit is contained in:
Andreas Fischer
2015-01-30 13:14:33 +01:00
parent 1642e560dc ab07be8157
commit b78ae290e8
5 changed files with 191 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
phpBB/phpbb/controller/helper.php
View File

@ -191,10 +191,25 @@ class helper
* @deprecated 3.1.3 (To be removed: 3.3.0) Use exceptions instead.
*/
public function error($message, $code = 500)
{
return $this->message($message, false, $code);
}
/**
* Output a message
*
* In case of an error, please throw an exception instead
*
* @param string $message The message to display
* @param string|false $title Title for the message
* @param int $code The HTTP status code (e.g. 404, 500, 503, etc.)
* @return Response A Response instance
*/
public function message($message, $title = false, $code = 200)
{
$this->template->assign_vars(array(
'MESSAGE_TEXT' => $message,
'MESSAGE_TITLE' => $this->user->lang('INFORMATION'),
'MESSAGE_TITLE' => ($title === false) ? $this->user->lang('INFORMATION') : $title,
));
return $this->render('message_body.html', $this->user->lang('INFORMATION'), $code);

35
phpBB/phpbb/db/migration/data/v31x/v313rc1.php Normal file
View File

@ -0,0 +1,35 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\db\migration\data\v31x;
class v313rc1 extends \phpbb\db\migration\migration
{
static public function depends_on()
{
return array(
'\phpbb\db\migration\data\v30x\release_3_0_13_rc1',
'\phpbb\db\migration\data\v31x\plupload_last_gc_dynamic',
'\phpbb\db\migration\data\v31x\profilefield_remove_underscore_from_alpha',
'\phpbb\db\migration\data\v31x\profilefield_yahoo_update_url',
'\phpbb\db\migration\data\v31x\update_custom_bbcodes_with_idn',
);
}
public function update_data()
{
return array(
array('config.update', array('version', '3.1.3-RC1')),
);
}
}