diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-06 17:15:45 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-06 17:15:45 +0000 |
| commit | 431e494ae43257bea251a59ed6b2a4bb20eb7fd4 (patch) | |
| tree | 66bea58ebc6be0c6a76b5444a73016fd2a97f7ff /phpBB/includes/acp/acp_language.php | |
| parent | 3933f0bab385f7702cd6335842aa42e004b3d195 (diff) | |
| download | forums-431e494ae43257bea251a59ed6b2a4bb20eb7fd4.tar forums-431e494ae43257bea251a59ed6b2a4bb20eb7fd4.tar.gz forums-431e494ae43257bea251a59ed6b2a4bb20eb7fd4.tar.bz2 forums-431e494ae43257bea251a59ed6b2a4bb20eb7fd4.tar.xz forums-431e494ae43257bea251a59ed6b2a4bb20eb7fd4.zip | |
To all people having their bug status set to fixed: SF pserver CVS access is currently down, therefore the snapshots are still out of date.
- fix a bunch of bugs
- <!-- $Id$ --> is no longer allowed in template (.html) files
- changed layout of private message screens (folders are menu items)
- removed unread mode for private messages
- added new feature to template engine - "jump out of loop" or "loop another loop within my loop" :D (will be documented within the coding guidelines)
- added autologin field to sessions
- check session length checks
- added add_log statement to sessions to track session valid to invalid changes if ip/browser change depending on config settings (only debug)
- added multibyte support for various variables (exception at the moment is usernames which needs some discussion)
- hopefully not broke something. :/
git-svn-id: file:///svn/phpbb/trunk@5765 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_language.php')
| -rw-r--r-- | phpBB/includes/acp/acp_language.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index 19ac78b301..751ce81bef 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -138,7 +138,7 @@ class acp_language 'DATA' => $data, 'NAME' => $user->lang[strtoupper($method . '_' . $data)], 'EXPLAIN' => $user->lang[strtoupper($method . '_' . $data) . '_EXPLAIN'], - 'DEFAULT' => $_REQUEST[$data] ? request_var($data, '') : $default + 'DEFAULT' => (!empty($_REQUEST[$data])) ? request_var($data, '') : $default )); } @@ -170,8 +170,8 @@ class acp_language $sql_ary = array( 'lang_english_name' => request_var('lang_english_name', $row['lang_english_name']), - 'lang_local_name' => request_var('lang_local_name', $row['lang_local_name']), - 'lang_author' => request_var('lang_author', $row['lang_author']), + 'lang_local_name' => request_var('lang_local_name', $row['lang_local_name'], true), + 'lang_author' => request_var('lang_author', $row['lang_author'], true), ); $db->sql_query('UPDATE ' . LANG_TABLE . ' @@ -238,7 +238,9 @@ class acp_language if ($this->language_directory == 'email') { // Email Template - fwrite($fp, (STRIP) ? stripslashes($_POST['entry']) : $_POST['entry']); + $entry = (STRIP) ? stripslashes($_POST['entry']) : $_POST['entry']; + $entry = preg_replace('#&(\#[0-9]+;)#', '&\1', $entry); + fwrite($fp, $entry); } else { @@ -263,6 +265,7 @@ class acp_language foreach ($value as $_key => $_value) { $_value = (STRIP) ? stripslashes($_value) : $_value; + $_value = preg_replace('#&(\#[0-9]+;)#', '&\1', $_value); $entry .= "\t\t" . (int) $_key . "\t=> '" . str_replace("'", "\\'", $_value) . "',\n"; } @@ -283,6 +286,7 @@ class acp_language if (!is_array($value)) { $value = (STRIP) ? stripslashes($value) : $value; + $value = preg_replace('#&(\#[0-9]+;)#', '&\1', $value); $entry = "\t'" . $key . "'\t=> '" . str_replace("'", "\\'", $value) . "',\n"; } else @@ -292,6 +296,7 @@ class acp_language foreach ($value as $_key => $_value) { $_value = (STRIP) ? stripslashes($_value) : $_value; + $_value = preg_replace('#&(\#[0-9]+;)#', '&\1', $_value); $entry .= "\t\t'" . $_key . "'\t=> '" . str_replace("'", "\\'", $_value) . "',\n"; } |