mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/includes/functions_user.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
This commit is contained in:
Joas Schilling
2016-02-13 18:08:01 +01:00
parent 971fe13a28 17e21d5140
commit 8663edce76
7 changed files with 91 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
phpBB/phpbb/db/migration/data/v31x/v318rc1.php Normal file
View File

@@ -0,0 +1,32 @@
<?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 v318rc1 extends \phpbb\db\migration\migration
{
static public function depends_on()
{
return array(
'\phpbb\db\migration\data\v31x\increase_size_of_dateformat',
'\phpbb\db\migration\data\v31x\v317pl1',
);
}
public function update_data()
{
return array(
array('config.update', array('version', '3.1.8-RC1')),
);
}
}

2
phpBB/phpbb/session.php
View File

@@ -1600,6 +1600,8 @@ class session
$db->sql_return_on_error(false);
$this->data = array_merge($this->data, $sql_ary);
if ($this->data['user_id'] != ANONYMOUS && !empty($config['new_member_post_limit']) && $this->data['user_new'] && $config['new_member_post_limit'] <= $this->data['user_posts'])
{
$this->leave_newly_registered();