diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-02-18 04:34:26 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-02-18 04:34:26 -0500 |
| commit | 0f89b488202f988e4f18264f4e05879f760d0ce9 (patch) | |
| tree | 84017c47bf12f55f11bc786a8962924f45650fc7 | |
| parent | 9a5263c63c25bbc865ef02a14d8fbac3727c6ca2 (diff) | |
| parent | 38360c71f298efee54396118b8afb5c642c79db3 (diff) | |
| download | forums-0f89b488202f988e4f18264f4e05879f760d0ce9.tar forums-0f89b488202f988e4f18264f4e05879f760d0ce9.tar.gz forums-0f89b488202f988e4f18264f4e05879f760d0ce9.tar.bz2 forums-0f89b488202f988e4f18264f4e05879f760d0ce9.tar.xz forums-0f89b488202f988e4f18264f4e05879f760d0ce9.zip | |
Merge PR #1236 branch 'dhruvgoel92/ticket/11359' into develop
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11359:
[ticket/11359] html escape sphinx config data
[ticket/11359] add id attribute to textarea
[ticket/11359] close span
| -rw-r--r-- | phpBB/includes/search/fulltext_sphinx.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php index 4bacf74f93..7304e70ff8 100644 --- a/phpBB/includes/search/fulltext_sphinx.php +++ b/phpBB/includes/search/fulltext_sphinx.php @@ -878,8 +878,8 @@ class phpbb_search_fulltext_sphinx <dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" /> ' . $this->user->lang['MIB'] . '</dd> </dl> <dl> - <dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</dt> - <dd>' . (($this->config_generate()) ? '<textarea readonly="readonly" rows="6">' . $this->config_file_data . '</textarea>' : $this->config_file_data) . '</dd> + <dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</span></dt> + <dd>' . (($this->config_generate()) ? '<textarea readonly="readonly" rows="6" id="sphinx_config_data">' . htmlspecialchars($this->config_file_data) . '</textarea>' : $this->config_file_data) . '</dd> <dl> '; |