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

Merge branch 'prep-release-3.1.11' into prep-release-3.2.1

Browse source
This commit is contained in:
Marc Alexander 2017-07-16 18:24:47 +02:00
commit c56ebb5312
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 64 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/ucp/ucp_remind.php
View file

@ -41,8 +41,15 @@ class ucp_remind
$email = strtolower($request->variable('email', '')); $email = strtolower($request->variable('email', ''));
$submit = (isset($_POST['submit'])) ? true : false; $submit = (isset($_POST['submit'])) ? true : false;
add_form_key('ucp_remind');
if ($submit) if ($submit)
{ {
if (!check_form_key('ucp_remind'))
{
trigger_error('FORM_INVALID');
}
$sql_array = array( $sql_array = array(
'SELECT' => 'user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type, user_lang, user_inactive_reason', 'SELECT' => 'user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type, user_lang, user_inactive_reason',
'FROM' => array(USERS_TABLE => 'u'), 'FROM' => array(USERS_TABLE => 'u'),

36
phpBB/phpbb/db/migration/data/v31x/v3111.php Normal file
View file

@ -0,0 +1,36 @@
<?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 v3111 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return phpbb_version_compare($this->config['version'], '3.1.11', '>=');
}
static public function depends_on()
{
return array(
'\phpbb\db\migration\data\v31x\v3111rc1',
);
}
public function update_data()
{
return array(
array('config.update', array('version', '3.1.11')),
);
}
}

21
phpBB/phpbb/search/fulltext_mysql.php
View file

@ -272,6 +272,27 @@ class fulltext_mysql extends \phpbb\search\base
foreach ($this->split_words as $i => $word) foreach ($this->split_words as $i => $word)
{ {
// Check for not allowed search queries for InnoDB.
// We assume similar restrictions for MyISAM, which is usually even
// slower but not as restrictive as InnoDB.
// InnoDB full-text search does not support the use of a leading
// plus sign with wildcard ('+*'), a plus and minus sign
// combination ('+-'), or leading a plus and minus sign combination.
// InnoDB full-text search only supports leading plus or minus signs.
// For example, InnoDB supports '+apple' but does not support 'apple+'.
// Specifying a trailing plus or minus sign causes InnoDB to report
// a syntax error. InnoDB full-text search does not support the use
// of multiple operators on a single search word, as in this example:
// '++apple'. Use of multiple operators on a single search word
// returns a syntax error to standard out.
// Also, ensure that the wildcard character is only used at the
// end of the line as it's intended by MySQL.
if (preg_match('#^(\+[+-]|\+\*|.+[+-]$|.+\*(?!$))#', $word))
{
unset($this->split_words[$i]);
continue;
}
$clean_word = preg_replace('#^[+\-|"]#', '', $word); $clean_word = preg_replace('#^[+\-|"]#', '', $word);
// check word length // check word length