diff options
Diffstat (limited to 'phpBB')
-rw-r--r-- | phpBB/phpbb/db/tools.php | 14 | ||||
-rw-r--r-- | phpBB/phpbb/groupposition/teampage.php | 4 | ||||
-rw-r--r-- | phpBB/phpbb/notification/manager.php | 2 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/base.php | 2 | ||||
-rw-r--r-- | phpBB/phpbb/search/base.php | 2 | ||||
-rw-r--r-- | phpBB/phpbb/search/fulltext_native.php | 6 | ||||
-rw-r--r-- | phpBB/phpbb/search/sphinx/config.php | 14 | ||||
-rw-r--r-- | phpBB/phpbb/session.php | 6 | ||||
-rw-r--r-- | phpBB/phpbb/template/context.php | 4 | ||||
-rw-r--r-- | phpBB/phpbb/template/twig/node/event.php | 4 | ||||
-rw-r--r-- | phpBB/phpbb/user.php | 2 |
11 files changed, 30 insertions, 30 deletions
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index d6ea7cc97b..1f156fbb04 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -505,7 +505,7 @@ class tools trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum auto increment column length is 26 characters.", E_USER_ERROR); } - // here we add the definition of the new \column to the list of columns + // here we add the definition of the new column to the list of columns switch ($this->sql_layer) { case 'mssql': @@ -992,7 +992,7 @@ class tools $column_list[] = $entities[0]; } - // note down the primary key notation because sqlite only supports adding it to the end for the new \table + // note down the primary key notation because sqlite only supports adding it to the end for the new table $primary_key = false; $_new_cols = array(); @@ -1080,7 +1080,7 @@ class tools $columns = implode(',', $column_list); - // create a new \table and fill it up. destroy the temp one + // create a new table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $new_table_cols) . ');'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; @@ -1812,7 +1812,7 @@ class tools $new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols; - // create a new \table and fill it up. destroy the temp one + // create a new table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; @@ -1927,7 +1927,7 @@ class tools $new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols); - // create a new \table and fill it up. destroy the temp one + // create a new table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; @@ -2119,7 +2119,7 @@ class tools $columns = implode(',', $column_list); - // create a new \table and fill it up. destroy the temp one + // create a new table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; @@ -2485,7 +2485,7 @@ class tools $columns = implode(',', $column_list); - // create a new \table and fill it up. destroy the temp one + // create a new table and fill it up. destroy the temp one $statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');'; $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; $statements[] = 'DROP TABLE ' . $table_name . '_temp'; diff --git a/phpBB/phpbb/groupposition/teampage.php b/phpBB/phpbb/groupposition/teampage.php index 4cd2ae7fa8..dc12768ddb 100644 --- a/phpBB/phpbb/groupposition/teampage.php +++ b/phpBB/phpbb/groupposition/teampage.php @@ -433,7 +433,7 @@ class teampage implements \phpbb\groupposition\groupposition_interface $sibling_count = 0; $sibling_limit = $delta; - // Reset the delta, as we recalculate the new \real delta + // Reset the delta, as we recalculate the new real delta $delta = 0; while ($row = $this->db->sql_fetchrow($result)) { @@ -521,7 +521,7 @@ class teampage implements \phpbb\groupposition\groupposition_interface $sibling_count = 0; $sibling_limit = $delta; - // Reset the delta, as we recalculate the new \real delta + // Reset the delta, as we recalculate the new real delta $delta = 0; while ($row = $this->db->sql_fetchrow($result)) { diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index 1c95b928cf..c42c84fb1f 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -379,7 +379,7 @@ class manager // Never send notifications to the anonymous user! unset($notify_users[ANONYMOUS]); - // Make sure not to send new \notifications to users who've already been notified about this item + // 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 $sql = 'SELECT n.user_id FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php index cc0355771b..3c44468bb8 100644 --- a/phpBB/phpbb/notification/type/base.php +++ b/phpBB/phpbb/notification/type/base.php @@ -145,7 +145,7 @@ abstract class base implements \phpbb\notification\type\type_interface */ public function set_initial_data($data = array()) { - // The row from the database (unless this is a new \notification we're going to add) + // The row from the database (unless this is a new notification we're going to add) $this->data = $data; $this->data['notification_data'] = (isset($this->data['notification_data'])) ? unserialize($this->data['notification_data']) : array(); } diff --git a/phpBB/phpbb/search/base.php b/phpBB/phpbb/search/base.php index 2f6b225b99..f2f982c31b 100644 --- a/phpBB/phpbb/search/base.php +++ b/phpBB/phpbb/search/base.php @@ -183,7 +183,7 @@ class base $store_ids = array_slice($id_ary, 0, $length); - // create a new \resultset if there is none for this search_key yet + // create a new resultset if there is none for this search_key yet // or add the ids to the existing resultset if (!($store = $cache->get('_search_results_' . $search_key))) { diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php index 006b88e07a..50cf588a46 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -1271,7 +1271,7 @@ class fulltext_native extends \phpbb\search\base // We now have unique arrays of all words to be added and removed and // individual arrays of added and removed words for text and title. What - // we need to do now is add the new \words (if they don't already exist) + // we need to do now is add the new words (if they don't already exist) // and then add (or remove) matches between the words and this post if (sizeof($unique_add_words)) { @@ -1308,7 +1308,7 @@ class fulltext_native extends \phpbb\search\base $this->db->sql_transaction('begin'); } - // now update the search match table, remove links to removed words and add links to new \words + // now update the search match table, remove links to removed words and add links to new words foreach ($words['del'] as $word_in => $word_ary) { $title_match = ($word_in == 'title') ? 1 : 0; @@ -1468,7 +1468,7 @@ class fulltext_native extends \phpbb\search\base WHERE ' . $this->db->sql_in_set('word_id', $sql_in); $this->db->sql_query($sql); - // by setting search_last_gc to the new \time here we make sure that if a user reloads because the + // by setting search_last_gc to the new time here we make sure that if a user reloads because the // following query takes too long, he won't run into it again set_config('search_last_gc', time(), true); diff --git a/phpBB/phpbb/search/sphinx/config.php b/phpBB/phpbb/search/sphinx/config.php index 2468022428..8462298e01 100644 --- a/phpBB/phpbb/search/sphinx/config.php +++ b/phpBB/phpbb/search/sphinx/config.php @@ -65,7 +65,7 @@ class config /** * Appends a new \empty section to the end of the config * - * @param string $name The name for the new \section + * @param string $name The name for the new section * @return \phpbb\search\sphinx\config_section The newly created section object * * @access public @@ -143,7 +143,7 @@ class config $section_name .= $line[$j]; } - // And then we create the new \section object + // And then we create the new section object $section_name = trim($section_name); $section = new \phpbb\search\sphinx\config_section($section_name, $section_name_comment); } @@ -163,7 +163,7 @@ class config $section->add_variable(new \phpbb\search\sphinx\config_comment($config_file[$i])); continue; } - + // As long as we haven't yet actually found an opening bracket for this section // we treat everything as comments so it's not deleted either if (!$found_opening_bracket) @@ -182,7 +182,7 @@ class config } } - // If we did not find a comment in this line or still add to the previous + // If we did not find a comment in this line or still add to the previous // line's value ... if ($line || $in_value) { @@ -241,8 +241,8 @@ class config } } - // If a name and an equal sign were found then we have append a - // new \variable object to the section + // If a name and an equal sign were found then we have append a + // new variable object to the section if ($name && $found_assignment) { $section->add_variable(new \phpbb\search\sphinx\config_variable(trim($name), trim($value), ($end_section) ? '' : $comment)); @@ -250,7 +250,7 @@ class config } /* If we found a closing curly bracket this section has been completed - and we can append it to the section list and continue with looking for + and we can append it to the section list and continue with looking for the next section */ if ($end_section) { diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 2bfa55334d..543369a3ab 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -499,13 +499,13 @@ class session } /** - * Create a new \session + * Create a new session * * If upon trying to start a session we discover there is nothing existing we * jump here. Additionally this method is called directly during login to regenerate * the session for the specific user. In this method we carry out a number of tasks; * garbage collection, (search)bot checking, banned user comparison. Basically - * though this method will result in a new \session for a specific user. + * though this method will result in a new session for a specific user. */ function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true) { @@ -775,7 +775,7 @@ class session if (!defined('IN_ERROR_HANDLER') && (!$this->session_id || !$db->sql_query($sql) || !$db->sql_affectedrows())) { - // Limit new \sessions in 1 minute period (if required) + // Limit new sessions in 1 minute period (if required) if (empty($this->data['session_time']) && $config['active_sessions']) { // $db->sql_return_on_error(false); diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php index 263f77a1b8..f978f82d33 100644 --- a/phpBB/phpbb/template/context.php +++ b/phpBB/phpbb/template/context.php @@ -160,7 +160,7 @@ class context } // Now we add the block that we're actually assigning to. - // We're adding a new \iteration to this block with the given + // We're adding a new iteration to this block with the given // variable assignments. $str[$blocks[$blockcount]][] = $vararray; @@ -192,7 +192,7 @@ class context unset($this->tpldata[$blockname][($s_row_count - 1)]['S_LAST_ROW']); } - // Add a new \iteration to this block with the variable assignments we were given. + // Add a new iteration to this block with the variable assignments we were given. $this->tpldata[$blockname][] = $vararray; // Set S_NUM_ROWS diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php index 1fc85ab4a2..202db775ee 100644 --- a/phpBB/phpbb/template/twig/node/event.php +++ b/phpBB/phpbb/template/twig/node/event.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) class event extends \Twig_Node { - /** + /** * The subdirectory in which all template listener files must be placed * @var string */ @@ -56,7 +56,7 @@ class event extends \Twig_Node // If debug mode is enabled, lets check for new/removed EVENT // templates on page load rather than at compile. This is // slower, but makes developing extensions easier (no need to - // purge the cache when a new \event template file is added) + // purge the cache when a new event template file is added) $compiler ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n") ->indent() diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index a5b3308288..f97cc94d40 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -43,7 +43,7 @@ class user extends \phpbb\session var $img_lang; var $img_array = array(); - // Able to add new \options (up to id 31) + // Able to add new options (up to id 31) var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'popuppm' => 10, 'sig_bbcode' => 15, 'sig_smilies' => 16, 'sig_links' => 17); /** |