aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-09-16 04:45:58 +0200
committerNils Adermann <naderman@naderman.de>2013-09-16 04:45:58 +0200
commitd626ebaf1e3d993ba3474c8dd403b18d5faf8863 (patch)
tree5fd13d2e53ad48a228164a85aa1a7978727b262e
parentccbb070652a188fd3b2354781d57af8847015eee (diff)
downloadforums-d626ebaf1e3d993ba3474c8dd403b18d5faf8863.tar
forums-d626ebaf1e3d993ba3474c8dd403b18d5faf8863.tar.gz
forums-d626ebaf1e3d993ba3474c8dd403b18d5faf8863.tar.bz2
forums-d626ebaf1e3d993ba3474c8dd403b18d5faf8863.tar.xz
forums-d626ebaf1e3d993ba3474c8dd403b18d5faf8863.zip
[ticket/11700] Fix a few more comments
PHPBB3-11700
-rw-r--r--phpBB/phpbb/auth/provider/db.php2
-rw-r--r--phpBB/phpbb/datetime.php2
-rw-r--r--phpBB/phpbb/db/driver/driver.php4
-rw-r--r--phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php8
-rw-r--r--phpBB/phpbb/db/migration/data/v310/dev.php2
-rw-r--r--phpBB/phpbb/db/migration/data/v310/timezone.php2
-rw-r--r--phpBB/phpbb/db/migration/exception.php6
-rw-r--r--phpBB/phpbb/db/migration/tool/config.php2
-rw-r--r--phpBB/phpbb/db/migration/tool/module.php2
-rw-r--r--phpBB/phpbb/db/migration/tool/permission.php2
-rw-r--r--phpBB/phpbb/db/migrator.php2
-rw-r--r--phpBB/phpbb/db/tools.php2
-rw-r--r--phpBB/phpbb/notification/manager.php2
-rw-r--r--phpBB/phpbb/notification/type/quote.php2
14 files changed, 20 insertions, 20 deletions
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php
index f613bafc6a..a18fc258a4 100644
--- a/phpBB/phpbb/auth/provider/db.php
+++ b/phpBB/phpbb/auth/provider/db.php
@@ -204,7 +204,7 @@ class db extends \phpbb\auth\provider\base
{
$hash = phpbb_hash($password_new_format);
- // Update the password in the users table to the new \format and remove user_pass_convert flag
+ // Update the password in the users table to the new format and remove user_pass_convert flag
$sql = 'UPDATE ' . USERS_TABLE . '
SET user_password = \'' . $this->db->sql_escape($hash) . '\',
user_pass_convert = 0
diff --git a/phpBB/phpbb/datetime.php b/phpBB/phpbb/datetime.php
index 2d48c8311e..84b13202af 100644
--- a/phpBB/phpbb/datetime.php
+++ b/phpBB/phpbb/datetime.php
@@ -30,7 +30,7 @@ class datetime extends \DateTime
static protected $format_cache = array();
/**
- * Constructs a new \instance of \phpbb\datetime, expanded to include an argument to inject
+ * Constructs a new instance of \phpbb\datetime, expanded to include an argument to inject
* the user context and modify the timezone to the users selected timezone if one is not set.
*
* @param string $time String in a format accepted by strtotime().
diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php
index a266b2aa48..cd960bc65a 100644
--- a/phpBB/phpbb/db/driver/driver.php
+++ b/phpBB/phpbb/db/driver/driver.php
@@ -274,7 +274,7 @@ class driver
* Correctly adjust LIKE expression for special characters
* Some DBMS are handling them in a different way
*
- * @param string $expression The expression to use. Every wildcard is escaped, \except $this->any_char and $this->one_char
+ * @param string $expression The expression to use. Every wildcard is escaped, except $this->any_char and $this->one_char
* @return string LIKE expression including the keyword!
*/
function sql_like_expression($expression)
@@ -452,7 +452,7 @@ class driver
* @param string $field name of the sql column that shall be compared
* @param array $array array of values that are allowed (IN) or not allowed (NOT IN)
* @param bool $negate true for NOT IN (), false for IN () (default)
- * @param bool $allow_empty_set If true, \allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
+ * @param bool $allow_empty_set If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
*/
function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
{
diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php
index 712d54a723..87d5e490f8 100644
--- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php
+++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_6_rc1.php
@@ -216,7 +216,7 @@ class release_3_0_6_rc1 extends \phpbb\db\migration\migration
$group_id = $this->db->sql_nextid();
}
- // Insert new \user role... at the end of the chain
+ // Insert new user role... at the end of the chain
$sql = 'SELECT role_id
FROM ' . ACL_ROLES_TABLE . "
WHERE role_name = 'ROLE_USER_NEW_MEMBER'
@@ -241,7 +241,7 @@ class release_3_0_6_rc1 extends \phpbb\db\migration\migration
$u_role = $this->db->sql_nextid();
// Now add the correct data to the roles...
- // The standard role says that new \users are not able to send a PM, Mass PM, are not able to PM groups
+ // The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
$this->sql_query($sql);
@@ -250,7 +250,7 @@ class release_3_0_6_rc1 extends \phpbb\db\migration\migration
$this->sql_query($sql);
}
- // Insert new \forum role
+ // Insert new forum role
$sql = 'SELECT role_id
FROM ' . ACL_ROLES_TABLE . "
WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
@@ -278,7 +278,7 @@ class release_3_0_6_rc1 extends \phpbb\db\migration\migration
$this->sql_query($sql);
}
- // Set every members user_new \column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
+ // Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
$sql = 'SELECT 1
FROM ' . USERS_TABLE . '
WHERE user_new = 0';
diff --git a/phpBB/phpbb/db/migration/data/v310/dev.php b/phpBB/phpbb/db/migration/data/v310/dev.php
index 5a10e7c236..c1db883616 100644
--- a/phpBB/phpbb/db/migration/data/v310/dev.php
+++ b/phpBB/phpbb/db/migration/data/v310/dev.php
@@ -185,7 +185,7 @@ class dev extends \phpbb\db\migration\migration
public function move_customise_modules()
{
- // Move language management to new \location in the Customise tab
+ // Move language management to new location in the Customise tab
// First get language module id
$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
WHERE module_basename = 'acp_language'";
diff --git a/phpBB/phpbb/db/migration/data/v310/timezone.php b/phpBB/phpbb/db/migration/data/v310/timezone.php
index 93c58819ce..e3b1912049 100644
--- a/phpBB/phpbb/db/migration/data/v310/timezone.php
+++ b/phpBB/phpbb/db/migration/data/v310/timezone.php
@@ -65,7 +65,7 @@ class timezone extends \phpbb\db\migration\migration
}
/**
- * Determine the new \timezone for a given phpBB 3.0 timezone and
+ * Determine the new timezone for a given phpBB 3.0 timezone and
* "Daylight Saving Time" option
*
* @param $timezone float Users timezone in 3.0
diff --git a/phpBB/phpbb/db/migration/exception.php b/phpBB/phpbb/db/migration/exception.php
index 8bf18dec68..58e29b5218 100644
--- a/phpBB/phpbb/db/migration/exception.php
+++ b/phpBB/phpbb/db/migration/exception.php
@@ -18,7 +18,7 @@ if (!defined('IN_PHPBB'))
}
/**
-* The migrator is responsible for applying new \migrations in the correct order.
+* The migrator is responsible for applying new migrations in the correct order.
*
* @package db
*/
@@ -66,8 +66,8 @@ class exception extends \Exception
}
/**
- * Get localised message (\with $user->lang())
- *
+ * Get localised message (with $user->lang())
+ *
* @param \phpbb\user $user
* @return string
*/
diff --git a/phpBB/phpbb/db/migration/tool/config.php b/phpBB/phpbb/db/migration/tool/config.php
index 6ff69bbd2b..f2149dc59a 100644
--- a/phpBB/phpbb/db/migration/tool/config.php
+++ b/phpBB/phpbb/db/migration/tool/config.php
@@ -80,7 +80,7 @@ class config implements \phpbb\db\migration\tool\tool_interface
* current config value
*
* @param string $compare If equal to the current config value, will be
- * updated to the new \config value, otherwise not
+ * updated to the new config value, otherwise not
* @param string $config_name The name of the config setting you would
* like to update
* @param mixed $config_value The value of the config setting
diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php
index ecb1176bd4..9869dd4230 100644
--- a/phpBB/phpbb/db/migration/tool/module.php
+++ b/phpBB/phpbb/db/migration/tool/module.php
@@ -131,7 +131,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
/**
* Module Add
*
- * Add a new \module
+ * Add a new module
*
* @param string $class The module class(acp|mcp|ucp)
* @param int|string $parent The parent module_id|module_langname (0 for no parent)
diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php
index 51b0996c30..dfb32f79f4 100644
--- a/phpBB/phpbb/db/migration/tool/permission.php
+++ b/phpBB/phpbb/db/migration/tool/permission.php
@@ -238,7 +238,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface
}
/**
- * Add a new \permission role
+ * Add a new permission role
*
* @param string $role_name The new \role name
* @param sting $role_type The type (u_, m_, a_)
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index 0b9463a622..d7d2b3df59 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -18,7 +18,7 @@ if (!defined('IN_PHPBB'))
}
/**
-* The migrator is responsible for applying new \migrations in the correct order.
+* The migrator is responsible for applying new migrations in the correct order.
*
* @package db
*/
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index 8ae58e2d4b..d6ea7cc97b 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -1703,7 +1703,7 @@ class tools
}
/**
- * Add new \column
+ * Add new column
*/
function sql_column_add($table_name, $column_name, $column_data, $inline = false)
{
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php
index a865f7d6b9..1c95b928cf 100644
--- a/phpBB/phpbb/notification/manager.php
+++ b/phpBB/phpbb/notification/manager.php
@@ -380,7 +380,7 @@ class manager
unset($notify_users[ANONYMOUS]);
// Make sure not to send new \notifications to users who've already been notified about this item
- // This may happen when an item was added, but now new \users are able to see the item
+ // This may happen when an item was added, but now new users are able to see the item
$sql = 'SELECT n.user_id
FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
WHERE n.notification_type_id = ' . (int) $notification_type_id . '
diff --git a/phpBB/phpbb/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php
index d59f7caf8e..b33766023e 100644
--- a/phpBB/phpbb/notification/type/quote.php
+++ b/phpBB/phpbb/notification/type/quote.php
@@ -168,7 +168,7 @@ class quote extends \phpbb\notification\type\post
}
$this->db->sql_freeresult($result);
- // Find the new \users to notify
+ // Find the new users to notify
$notifications = $this->find_users_for_notification($post);
// Find the notifications we must delete