mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
[ticket/11700] Fix some more incorrectly changed comments
PHPBB3-11700
This commit is contained in:
parent
cc6f1e1775
commit
06e7c84235
14 changed files with 15 additions and 15 deletions
|
@ -204,8 +204,8 @@ class apache extends \phpbb\auth\provider\base
|
||||||
* This function generates an array which can be passed to the user_add
|
* This function generates an array which can be passed to the user_add
|
||||||
* function in order to create a user
|
* function in order to create a user
|
||||||
*
|
*
|
||||||
* @param string $username The username of the new \user.
|
* @param string $username The username of the new user.
|
||||||
* @param string $password The password of the new \user.
|
* @param string $password The password of the new user.
|
||||||
* @return array Contains data that can be passed directly to
|
* @return array Contains data that can be passed directly to
|
||||||
* the user_add function.
|
* the user_add function.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -241,7 +241,7 @@ class db extends \phpbb\auth\provider\base
|
||||||
{
|
{
|
||||||
$hash = phpbb_hash($password);
|
$hash = phpbb_hash($password);
|
||||||
|
|
||||||
// Update the password in the users table to the new \format
|
// Update the password in the users table to the new format
|
||||||
$sql = 'UPDATE ' . USERS_TABLE . "
|
$sql = 'UPDATE ' . USERS_TABLE . "
|
||||||
SET user_password = '" . $this->db->sql_escape($hash) . "',
|
SET user_password = '" . $this->db->sql_escape($hash) . "',
|
||||||
user_pass_convert = 0
|
user_pass_convert = 0
|
||||||
|
|
|
@ -263,7 +263,7 @@ class teampage implements \phpbb\groupposition\groupposition_interface
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds a new \category
|
* Adds a new category
|
||||||
*
|
*
|
||||||
* @param string $category_name Name of the category to be added
|
* @param string $category_name Name of the category to be added
|
||||||
* @return bool True if the category was added successfully
|
* @return bool True if the category was added successfully
|
||||||
|
|
|
@ -114,7 +114,7 @@ class bookmark extends \phpbb\notification\type\post
|
||||||
$result = $this->db->sql_query($sql);
|
$result = $this->db->sql_query($sql);
|
||||||
while ($row = $this->db->sql_fetchrow($result))
|
while ($row = $this->db->sql_fetchrow($result))
|
||||||
{
|
{
|
||||||
// Do not create a new \notification
|
// Do not create a new notification
|
||||||
unset($notify_users[$row['user_id']]);
|
unset($notify_users[$row['user_id']]);
|
||||||
|
|
||||||
$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
|
$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
|
||||||
|
|
|
@ -149,7 +149,7 @@ class post extends \phpbb\notification\type\base
|
||||||
$result = $this->db->sql_query($sql);
|
$result = $this->db->sql_query($sql);
|
||||||
while ($row = $this->db->sql_fetchrow($result))
|
while ($row = $this->db->sql_fetchrow($result))
|
||||||
{
|
{
|
||||||
// Do not create a new \notification
|
// Do not create a new notification
|
||||||
unset($notify_users[$row['user_id']]);
|
unset($notify_users[$row['user_id']]);
|
||||||
|
|
||||||
$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
|
$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
|
||||||
|
|
|
@ -133,7 +133,7 @@ class quote extends \phpbb\notification\type\post
|
||||||
$result = $this->db->sql_query($sql);
|
$result = $this->db->sql_query($sql);
|
||||||
while ($row = $this->db->sql_fetchrow($result))
|
while ($row = $this->db->sql_fetchrow($result))
|
||||||
{
|
{
|
||||||
// Do not create a new \notification
|
// Do not create a new notification
|
||||||
unset($notify_users[$row['user_id']]);
|
unset($notify_users[$row['user_id']]);
|
||||||
|
|
||||||
$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
|
$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
|
||||||
|
|
|
@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Topic notifications class
|
* Topic notifications class
|
||||||
* This class handles notifications for new \topics
|
* This class handles notifications for new topics
|
||||||
*
|
*
|
||||||
* @package notifications
|
* @package notifications
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -714,7 +714,7 @@ class fulltext_mysql extends \phpbb\search\base
|
||||||
*/
|
*/
|
||||||
public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
|
public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
|
||||||
{
|
{
|
||||||
// Split old and new \post/subject to obtain array of words
|
// Split old and new post/subject to obtain array of words
|
||||||
$split_text = $this->split_message($message);
|
$split_text = $this->split_message($message);
|
||||||
$split_title = ($subject) ? $this->split_message($subject) : array();
|
$split_title = ($subject) ? $this->split_message($subject) : array();
|
||||||
|
|
||||||
|
|
|
@ -1224,7 +1224,7 @@ class fulltext_native extends \phpbb\search\base
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Split old and new \post/subject to obtain array of 'words'
|
// Split old and new post/subject to obtain array of 'words'
|
||||||
$split_text = $this->split_message($message);
|
$split_text = $this->split_message($message);
|
||||||
$split_title = $this->split_message($subject);
|
$split_title = $this->split_message($subject);
|
||||||
|
|
||||||
|
|
|
@ -744,7 +744,7 @@ class fulltext_postgres extends \phpbb\search\base
|
||||||
*/
|
*/
|
||||||
public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
|
public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
|
||||||
{
|
{
|
||||||
// Split old and new \post/subject to obtain array of words
|
// Split old and new post/subject to obtain array of words
|
||||||
$split_text = $this->split_message($message);
|
$split_text = $this->split_message($message);
|
||||||
$split_title = ($subject) ? $this->split_message($subject) : array();
|
$split_title = ($subject) ? $this->split_message($subject) : array();
|
||||||
|
|
||||||
|
|
|
@ -422,7 +422,7 @@ class fulltext_sphinx
|
||||||
$this->sphinx->SetMatchMode(SPH_MATCH_ANY);
|
$this->sphinx->SetMatchMode(SPH_MATCH_ANY);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Keep quotes and new \lines
|
// Keep quotes and new lines
|
||||||
$keywords = str_replace(array('"', "\n"), array('"', ' '), trim($keywords));
|
$keywords = str_replace(array('"', "\n"), array('"', ' '), trim($keywords));
|
||||||
|
|
||||||
if (strlen($keywords) > 0)
|
if (strlen($keywords) > 0)
|
||||||
|
|
|
@ -26,7 +26,7 @@ class config_comment
|
||||||
private $exact_string;
|
private $exact_string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new \comment
|
* Create a new comment
|
||||||
*
|
*
|
||||||
* @param string $exact_string The content of the comment including newlines, leading whitespace, etc.
|
* @param string $exact_string The content of the comment including newlines, leading whitespace, etc.
|
||||||
*
|
*
|
||||||
|
|
|
@ -29,7 +29,7 @@ class config_section
|
||||||
private $variables = array();
|
private $variables = array();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Construct a new \section
|
* Construct a new section
|
||||||
*
|
*
|
||||||
* @param string $name Name of the section
|
* @param string $name Name of the section
|
||||||
* @param string $comment Comment that should be appended after the name in the
|
* @param string $comment Comment that should be appended after the name in the
|
||||||
|
|
|
@ -225,7 +225,7 @@ class context
|
||||||
* @param string $mode Mode to execute (valid modes are 'insert' and 'change')
|
* @param string $mode Mode to execute (valid modes are 'insert' and 'change')
|
||||||
*
|
*
|
||||||
* If insert, the vararray is inserted at the given position (position counting from zero).
|
* If insert, the vararray is inserted at the given position (position counting from zero).
|
||||||
* If change, the current block gets merged with the vararray (resulting in new \key/value pairs be added and existing keys be replaced by the new \value).
|
* If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new \value).
|
||||||
*
|
*
|
||||||
* Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
|
* Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
|
||||||
* and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
|
* and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
|
||||||
|
|
Loading…
Add table
Reference in a new issue