aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-12-15 17:07:01 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2012-12-15 17:07:01 -0600
commit0f35f94398dbb8b64d420dc8ebcdea760cade113 (patch)
tree3f7258b3bf607984ef3bedc76bfaaf407e828ced
parentb6778802b3784da34db4890eabd6c64100a385fc (diff)
parent066649946802896a3a18cc1868fe0e1795db3efb (diff)
downloadforums-0f35f94398dbb8b64d420dc8ebcdea760cade113.tar
forums-0f35f94398dbb8b64d420dc8ebcdea760cade113.tar.gz
forums-0f35f94398dbb8b64d420dc8ebcdea760cade113.tar.bz2
forums-0f35f94398dbb8b64d420dc8ebcdea760cade113.tar.xz
forums-0f35f94398dbb8b64d420dc8ebcdea760cade113.zip
Merge remote-tracking branch 'remotes/bantu/ticket/11273' into develop
# By Andreas Fischer # Via Andreas Fischer * remotes/bantu/ticket/11273: [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.
-rw-r--r--phpBB/includes/search/fulltext_sphinx.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index a84a64825c..4bacf74f93 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -875,7 +875,7 @@ class phpbb_search_fulltext_sphinx
</dl>
<dl>
<dt><label for="fulltext_sphinx_indexer_mem_limit">' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'] . '</span></dt>
- <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>
+ <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>