aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/search/search.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-06-03 22:19:41 +0000
committerNils Adermann <naderman@naderman.de>2006-06-03 22:19:41 +0000
commit6ba50e34d60441e3eaf6c9fe1bff95a902393c84 (patch)
treee9ba8f0c1c5ff596a41ca070a0a80e641efebc77 /phpBB/includes/search/search.php
parent9aa9cb4bb6d9ad21db25bf24e70ed35b92c0f1a9 (diff)
downloadforums-6ba50e34d60441e3eaf6c9fe1bff95a902393c84.tar
forums-6ba50e34d60441e3eaf6c9fe1bff95a902393c84.tar.gz
forums-6ba50e34d60441e3eaf6c9fe1bff95a902393c84.tar.bz2
forums-6ba50e34d60441e3eaf6c9fe1bff95a902393c84.tar.xz
forums-6ba50e34d60441e3eaf6c9fe1bff95a902393c84.zip
- removed useless code from style.php
- added a view template cache mode to acp_styles - syntax highlighting for the acp css - completed refresh actions for themes and templates - fixed theme and template installation - use a function for generating database theme data - removed useless code from mcp_queue.php we might need to do some more tests of acp_styles with safe_mode on git-svn-id: file:///svn/phpbb/trunk@6007 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/search/search.php')
-rwxr-xr-xphpBB/includes/search/search.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/search/search.php b/phpBB/includes/search/search.php
index ddf5ca9796..fc9cf2bf02 100755
--- a/phpBB/includes/search/search.php
+++ b/phpBB/includes/search/search.php
@@ -18,7 +18,7 @@ if (!defined('IN_PHPBB'))
/**
* @ignore
*/
-define('SEARCH_RESULT_NOT_IN_CACHE', 2);
+define('SEARCH_RESULT_NOT_IN_CACHE', 0);
define('SEARCH_RESULT_IN_CACHE', 1);
define('SEARCH_RESULT_INCOMPLETE', 2);
@@ -94,7 +94,7 @@ class search_backend
* @param int result_count will contain the number of all results for the search (not only for the current page)
* @param array id_ary is filled with the ids belonging to the requested page that are stored in the cache
*
- * @return SEARCH_RESULT_NOT_IN_CACHE or SEARCH_RESULT_IN_CACHE or SEARCH_RESULT_INCOMPLETE
+ * @return int SEARCH_RESULT_NOT_IN_CACHE or SEARCH_RESULT_IN_CACHE or SEARCH_RESULT_INCOMPLETE
*/
function obtain_ids($search_key, &$result_count, &$id_ary, $start, $per_page, $sort_dir)
{
span class="hl opt">; use cpio; use log; my @fields = my %languages = ( "en" => [ "English", undef, undef, "en_US" ], "fr" => [ "French", "lat0-sun16", "iso15", "fr_FR" ], "de" => [ "German", "lat0-sun16", "iso15", "de_DE" ], "hu" => [ "Hungarian", "lat2-sun16", "iso02", "hu_HU" ], "is" => [ "Icelandic", "lat0-sun16", "iso15", "is_IS" ], "it" => [ "Italian", "lat0-sun16", "iso15", "it_IT" ], "no" => [ "Norwegian", "lat0-sun16", "iso15", "no_NO" ], "ro" => [ "Romanian", "lat2-sun16", "iso02", "ro_RO" ], "sk" => [ "Slovak", "lat2-sun16", "iso02", "sk_SK" ], "ru" => [ "Russian", "Cyr_a8x16", "koi2alt", "ru_SU" ], "uk_UA"=> [ "Ukrainian", "ruscii_8x16", "koi2alt", "uk_UA" ], ); 1; sub list { map { $_->[0] } values %languages } sub text2lang { my ($t) = @_; while (my ($k, $v) = each %languages) { $v->[0] eq $t and return $k; } die "unknown language $t"; } sub set { my $lang = shift; if ($lang) { $ENV{LANG} = $ENV{LINGUAS} = $lang; $ENV{LC_ALL} = $languages{$lang}->[3]; #if (my $f = $languages{$lang}->[1]) { load_font($f) } } else { # stick with the default (English) */ delete $ENV{LANG}; delete $ENV{LC_ALL}; delete $ENV{LINGUAS}; } } sub write { my ($prefix) = @_; my $lang = $ENV{LANG}; $lang or return; local *F; open F, "> $prefix/etc/sysconfig/i18n" or die "failed to reset $prefix/etc/sysconfig/i18n for writing"; my $f = sub { $_[1] and print F "$_[0]=$_[1]\n"; }; &$f("LANG", $lang); &$f("LINGUAS", $lang); if (my $l = $languages{$lang}) { &$f("LC_ALL", $l->[3]);