diff options
| author | JoshyPHP <s9e.dev@gmail.com> | 2015-05-19 09:48:29 +0200 |
|---|---|---|
| committer | JoshyPHP <s9e.dev@gmail.com> | 2015-05-30 17:26:01 +0200 |
| commit | 75eb283f8d7a7afcd3945d0d28bd0f58aa4f0cd6 (patch) | |
| tree | 26b4e880035bfe0f8258d9339e9cda8ea1e6f608 /phpBB/phpbb/textreparser | |
| parent | 54b18df084b845c058426b38e7ccfeb534d04ce0 (diff) | |
| download | forums-75eb283f8d7a7afcd3945d0d28bd0f58aa4f0cd6.tar forums-75eb283f8d7a7afcd3945d0d28bd0f58aa4f0cd6.tar.gz forums-75eb283f8d7a7afcd3945d0d28bd0f58aa4f0cd6.tar.bz2 forums-75eb283f8d7a7afcd3945d0d28bd0f58aa4f0cd6.tar.xz forums-75eb283f8d7a7afcd3945d0d28bd0f58aa4f0cd6.zip | |
[ticket/13803] Renamed methods
PHPBB3-13803
Diffstat (limited to 'phpBB/phpbb/textreparser')
| -rw-r--r-- | phpBB/phpbb/textreparser/base.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/textreparser/plugins/contact_admin_info.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/textreparser/plugins/poll_option.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/textreparser/reparser_interface.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/textreparser/row_based_plugin.php | 7 |
5 files changed, 11 insertions, 10 deletions
diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php index 47ac177e05..2b8cacb092 100644 --- a/phpBB/phpbb/textreparser/base.php +++ b/phpBB/phpbb/textreparser/base.php @@ -25,9 +25,9 @@ abstract class base implements reparser_interface * * @param integer $min_id Lower bound * @param integer $max_id Upper bound - * @return array Array of record + * @return array Array of records */ - abstract protected function get_records($min_id, $max_id); + abstract protected function get_records_by_range($min_id, $max_id); /** * {@inheritdoc} @@ -161,7 +161,7 @@ abstract class base implements reparser_interface */ public function reparse_range($min_id, $max_id) { - foreach ($this->get_records($min_id, $max_id) as $record) + foreach ($this->get_records_by_range($min_id, $max_id) as $record) { $this->reparse_record($record); } diff --git a/phpBB/phpbb/textreparser/plugins/contact_admin_info.php b/phpBB/phpbb/textreparser/plugins/contact_admin_info.php index d21ef89445..8910f2256b 100644 --- a/phpBB/phpbb/textreparser/plugins/contact_admin_info.php +++ b/phpBB/phpbb/textreparser/plugins/contact_admin_info.php @@ -41,7 +41,7 @@ class contact_admin_info extends \phpbb\textreparser\base /** * {@inheritdoc} */ - protected function get_records($min_id, $max_id) + protected function get_records_by_range($min_id, $max_id) { $values = $this->config_text->get_array(array( 'contact_admin_info', diff --git a/phpBB/phpbb/textreparser/plugins/poll_option.php b/phpBB/phpbb/textreparser/plugins/poll_option.php index 3249e21694..7b803146c4 100644 --- a/phpBB/phpbb/textreparser/plugins/poll_option.php +++ b/phpBB/phpbb/textreparser/plugins/poll_option.php @@ -46,7 +46,7 @@ class poll_option extends \phpbb\textreparser\base /** * {@inheritdoc} */ - protected function get_records($min_id, $max_id) + protected function get_records_by_range($min_id, $max_id) { $sql = 'SELECT o.topic_id, o.poll_option_id, o.poll_option_text AS text, p.bbcode_uid FROM ' . POLL_OPTIONS_TABLE . ' o, ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p diff --git a/phpBB/phpbb/textreparser/reparser_interface.php b/phpBB/phpbb/textreparser/reparser_interface.php index 20f8d92b1a..9ea1732870 100644 --- a/phpBB/phpbb/textreparser/reparser_interface.php +++ b/phpBB/phpbb/textreparser/reparser_interface.php @@ -25,8 +25,8 @@ interface reparser_interface /** * Reparse all records in given range * - * @param integer $min_id Lower bound - * @param integer $max_id Upper bound + * @param integer $min_id Lower bound + * @param integer $max_id Upper bound */ public function reparse_range($min_id, $max_id); } diff --git a/phpBB/phpbb/textreparser/row_based_plugin.php b/phpBB/phpbb/textreparser/row_based_plugin.php index 05a6e19553..d3ca334591 100644 --- a/phpBB/phpbb/textreparser/row_based_plugin.php +++ b/phpBB/phpbb/textreparser/row_based_plugin.php @@ -62,9 +62,10 @@ abstract class row_based_plugin extends base /** * {@inheritdoc} */ - protected function get_records($min_id, $max_id) + protected function get_records_by_range($min_id, $max_id) { - $result = $this->db->sql_query($this->get_records_query($min_id, $max_id)); + $sql = $this->get_records_by_range_query($min_id, $max_id); + $result = $this->db->sql_query($sql); $records = $this->db->sql_fetchrowset($result); $this->db->sql_freeresult($result); @@ -78,7 +79,7 @@ abstract class row_based_plugin extends base * @param integer $max_id Upper bound * @return string SQL query */ - protected function get_records_query($min_id, $max_id) + protected function get_records_by_range_query($min_id, $max_id) { $columns = $this->get_columns(); $fields = array(); |