diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-07-12 23:21:57 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-07-12 23:21:57 +0000 |
| commit | 5bf6bc18801a7b0ead230b20060bf20c52edb99f (patch) | |
| tree | ff1a86a246461ce1910ebf1fc84f6b6722455b95 /phpBB/includes/acp | |
| parent | 44b78d7c8dcb8026d4bb7f3bca0c78e93027a2ac (diff) | |
| download | forums-5bf6bc18801a7b0ead230b20060bf20c52edb99f.tar forums-5bf6bc18801a7b0ead230b20060bf20c52edb99f.tar.gz forums-5bf6bc18801a7b0ead230b20060bf20c52edb99f.tar.bz2 forums-5bf6bc18801a7b0ead230b20060bf20c52edb99f.tar.xz forums-5bf6bc18801a7b0ead230b20060bf20c52edb99f.zip | |
- it's \r\n not \n\r [Bug #3121]
- a few little search bugfixes
- drop in the improved version of the native search based on UTF-8 (still needs some work before it can replace the current native search)
Thanks Ashe :)
git-svn-id: file:///svn/phpbb/trunk@6175 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index f955a0432e..5eb180398b 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -524,6 +524,12 @@ class acp_search include_once("{$phpbb_root_path}includes/search/$type.$phpEx"); + if (!class_exists($type)) + { + $error = $user->lang['NO_SUCH_SEARCH_MODULE']; + return $error; + } + $error = false; $search = new $type($error); diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index cbf386b04d..2d123c5597 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -491,7 +491,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $filelist = $filelist_cats = array(); // we want newlines no carriage returns! - $_POST['template_data'] = (isset($_POST['template_data']) && !empty($_POST['template_data'])) ? str_replace(array("\n\r", "\r"), array("\n", "\n"), $_POST['template_data']) : ''; + $_POST['template_data'] = (isset($_POST['template_data']) && !empty($_POST['template_data'])) ? str_replace(array("\r\n", "\r"), array("\n", "\n"), $_POST['template_data']) : ''; $template_data = (STRIP) ? stripslashes($_POST['template_data']) : $_POST['template_data']; $template_file = request_var('template_file', ''); @@ -736,7 +736,7 @@ pagination_sep = \'{PAGINATION_SEP}\' 'FILENAME' => str_replace('.', '/', $source) . '.html') ); - $code = str_replace(array("\n\r", "\r"), array("\n", "\n"), file_get_contents("{$phpbb_root_path}cache/{$cache_prefix}_$source.html.$phpEx")); + $code = str_replace(array("\r\n", "\r"), array("\n", "\n"), file_get_contents("{$phpbb_root_path}cache/{$cache_prefix}_$source.html.$phpEx")); $conf = array('highlight.bg', 'highlight.comment', 'highlight.default', 'highlight.html', 'highlight.keyword', 'highlight.string'); foreach ($conf as $ini_var) @@ -824,7 +824,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $this->page_title = 'EDIT_THEME'; // we want newlines no carriage returns! - $_POST['css_data'] = (isset($_POST['css_data']) && !empty($_POST['css_data'])) ? str_replace(array("\n\r", "\r"), array("\n", "\n"), $_POST['css_data']) : ''; + $_POST['css_data'] = (isset($_POST['css_data']) && !empty($_POST['css_data'])) ? str_replace(array("\r\n", "\r"), array("\n", "\n"), $_POST['css_data']) : ''; $template_data = (STRIP) ? stripslashes($_POST['template_data']) : $_POST['template_data']; |