aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-09-19 15:27:03 +0200
committerNils Adermann <naderman@naderman.de>2013-09-19 15:27:03 +0200
commit06e7c842357fd26104efba6b7a0465d7c05c4493 (patch)
treefe96e494969323567dbc6c435fb458e6d73c2b21 /phpBB/phpbb
parentcc6f1e1775bc81a374a5c168968d48daf494a950 (diff)
downloadforums-06e7c842357fd26104efba6b7a0465d7c05c4493.tar
forums-06e7c842357fd26104efba6b7a0465d7c05c4493.tar.gz
forums-06e7c842357fd26104efba6b7a0465d7c05c4493.tar.bz2
forums-06e7c842357fd26104efba6b7a0465d7c05c4493.tar.xz
forums-06e7c842357fd26104efba6b7a0465d7c05c4493.zip
[ticket/11700] Fix some more incorrectly changed comments
PHPBB3-11700
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/auth/provider/apache.php4
-rw-r--r--phpBB/phpbb/auth/provider/db.php2
-rw-r--r--phpBB/phpbb/groupposition/teampage.php2
-rw-r--r--phpBB/phpbb/notification/type/bookmark.php2
-rw-r--r--phpBB/phpbb/notification/type/post.php2
-rw-r--r--phpBB/phpbb/notification/type/quote.php2
-rw-r--r--phpBB/phpbb/notification/type/topic.php2
-rw-r--r--phpBB/phpbb/search/fulltext_mysql.php2
-rw-r--r--phpBB/phpbb/search/fulltext_native.php2
-rw-r--r--phpBB/phpbb/search/fulltext_postgres.php2
-rw-r--r--phpBB/phpbb/search/fulltext_sphinx.php2
-rw-r--r--phpBB/phpbb/search/sphinx/config_comment.php2
-rw-r--r--phpBB/phpbb/search/sphinx/config_section.php2
-rw-r--r--phpBB/phpbb/template/context.php2
14 files changed, 15 insertions, 15 deletions
diff --git a/phpBB/phpbb/auth/provider/apache.php b/phpBB/phpbb/auth/provider/apache.php
index cd1330e7b0..5cbb63c4fc 100644
--- a/phpBB/phpbb/auth/provider/apache.php
+++ b/phpBB/phpbb/auth/provider/apache.php
@@ -204,8 +204,8 @@ class apache extends \phpbb\auth\provider\base
* This function generates an array which can be passed to the user_add
* function in order to create a user
*
- * @param string $username The username of the new \user.
- * @param string $password The password of the new \user.
+ * @param string $username The username of the new user.
+ * @param string $password The password of the new user.
* @return array Contains data that can be passed directly to
* the user_add function.
*/
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php
index a18fc258a4..4654e49fb5 100644
--- a/phpBB/phpbb/auth/provider/db.php
+++ b/phpBB/phpbb/auth/provider/db.php
@@ -241,7 +241,7 @@ class db extends \phpbb\auth\provider\base
{
$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 . "
SET user_password = '" . $this->db->sql_escape($hash) . "',
user_pass_convert = 0
diff --git a/phpBB/phpbb/groupposition/teampage.php b/phpBB/phpbb/groupposition/teampage.php
index dc12768ddb..4e8228eb58 100644
--- a/phpBB/phpbb/groupposition/teampage.php
+++ b/phpBB/phpbb/groupposition/teampage.php
@@ -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
* @return bool True if the category was added successfully
diff --git a/phpBB/phpbb/notification/type/bookmark.php b/phpBB/phpbb/notification/type/bookmark.php
index 5b021eb71a..50ea7380af 100644
--- a/phpBB/phpbb/notification/type/bookmark.php
+++ b/phpBB/phpbb/notification/type/bookmark.php
@@ -114,7 +114,7 @@ class bookmark extends \phpbb\notification\type\post
$result = $this->db->sql_query($sql);
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']]);
$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php
index 24ce0cc145..fe50e7f172 100644
--- a/phpBB/phpbb/notification/type/post.php
+++ b/phpBB/phpbb/notification/type/post.php
@@ -149,7 +149,7 @@ class post extends \phpbb\notification\type\base
$result = $this->db->sql_query($sql);
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']]);
$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
diff --git a/phpBB/phpbb/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php
index b33766023e..56cfbc9364 100644
--- a/phpBB/phpbb/notification/type/quote.php
+++ b/phpBB/phpbb/notification/type/quote.php
@@ -133,7 +133,7 @@ class quote extends \phpbb\notification\type\post
$result = $this->db->sql_query($sql);
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']]);
$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
diff --git a/phpBB/phpbb/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php
index 9042a21017..8db02f610b 100644
--- a/phpBB/phpbb/notification/type/topic.php
+++ b/phpBB/phpbb/notification/type/topic.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
/**
* Topic notifications class
-* This class handles notifications for new \topics
+* This class handles notifications for new topics
*
* @package notifications
*/
diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php
index 2508ab6d9a..50d2d2577f 100644
--- a/phpBB/phpbb/search/fulltext_mysql.php
+++ b/phpBB/phpbb/search/fulltext_mysql.php
@@ -714,7 +714,7 @@ class fulltext_mysql extends \phpbb\search\base
*/
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_title = ($subject) ? $this->split_message($subject) : array();
diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php
index 50cf588a46..33326f2882 100644
--- a/phpBB/phpbb/search/fulltext_native.php
+++ b/phpBB/phpbb/search/fulltext_native.php
@@ -1224,7 +1224,7 @@ class fulltext_native extends \phpbb\search\base
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_title = $this->split_message($subject);
diff --git a/phpBB/phpbb/search/fulltext_postgres.php b/phpBB/phpbb/search/fulltext_postgres.php
index 383645920a..756034103e 100644
--- a/phpBB/phpbb/search/fulltext_postgres.php
+++ b/phpBB/phpbb/search/fulltext_postgres.php
@@ -744,7 +744,7 @@ class fulltext_postgres extends \phpbb\search\base
*/
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_title = ($subject) ? $this->split_message($subject) : array();
diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php
index 81cb31e6e2..cb76d58f49 100644
--- a/phpBB/phpbb/search/fulltext_sphinx.php
+++ b/phpBB/phpbb/search/fulltext_sphinx.php
@@ -422,7 +422,7 @@ class fulltext_sphinx
$this->sphinx->SetMatchMode(SPH_MATCH_ANY);
}
- // Keep quotes and new \lines
+ // Keep quotes and new lines
$keywords = str_replace(array('&quot;', "\n"), array('"', ' '), trim($keywords));
if (strlen($keywords) > 0)
diff --git a/phpBB/phpbb/search/sphinx/config_comment.php b/phpBB/phpbb/search/sphinx/config_comment.php
index 66000e4031..77a943377d 100644
--- a/phpBB/phpbb/search/sphinx/config_comment.php
+++ b/phpBB/phpbb/search/sphinx/config_comment.php
@@ -26,7 +26,7 @@ class config_comment
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.
*
diff --git a/phpBB/phpbb/search/sphinx/config_section.php b/phpBB/phpbb/search/sphinx/config_section.php
index 7e6939576b..730abf011e 100644
--- a/phpBB/phpbb/search/sphinx/config_section.php
+++ b/phpBB/phpbb/search/sphinx/config_section.php
@@ -29,7 +29,7 @@ class config_section
private $variables = array();
/**
- * Construct a new \section
+ * Construct a new section
*
* @param string $name Name of the section
* @param string $comment Comment that should be appended after the name in the
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index f978f82d33..24234c1e4a 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -225,7 +225,7 @@ class context
* @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 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)
* and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)