diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-10-06 17:21:10 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-10-06 17:21:10 +0000 |
| commit | 2e1b7d42b18f713c1c5b3376447667eb66ee6feb (patch) | |
| tree | 8fc6b1e952b320a6f0ffec5eccfb25d5bc6fb7b0 | |
| parent | 12b93f808034f64f64d92d009ec3dbb15294b322 (diff) | |
| download | forums-2e1b7d42b18f713c1c5b3376447667eb66ee6feb.tar forums-2e1b7d42b18f713c1c5b3376447667eb66ee6feb.tar.gz forums-2e1b7d42b18f713c1c5b3376447667eb66ee6feb.tar.bz2 forums-2e1b7d42b18f713c1c5b3376447667eb66ee6feb.tar.xz forums-2e1b7d42b18f713c1c5b3376447667eb66ee6feb.zip | |
Fixed preg single quote potential problem, altered jumpbox slightly
git-svn-id: file:///svn/phpbb/trunk@1136 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/functions.php | 4 | ||||
| -rw-r--r-- | phpBB/templates/subSilver/jumpbox.tpl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 9eb5dd3915..2399882dcb 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -146,7 +146,7 @@ function make_jumpbox($match_forum_id = 0) $total_forums = $db->sql_numrows($q_forums); $forum_rows = $db->sql_fetchrowset($q_forums); - $boxstring = '<select name="' . POST_FORUM_URL . '"><option value="-1">' . $lang['Select_forum'] . '</option>'; + $boxstring = '<select name="' . POST_FORUM_URL . '" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"><option value="-1">' . $lang['Select_forum'] . '</option>'; for($i = 0; $i < $total_categories; $i++) { $boxstring .= '<option value="-1"> </option>'; @@ -830,7 +830,7 @@ function smilies_pass($message) usort($smilies, 'smiley_sort'); for($i = 0; $i < count($smilies); $i++) { - $orig[] = "'(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code']) . "(?=.\\W|\\W.|\\W$)'i"; + $orig[] = "/(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code']) . "(?=.\\W|\\W.|\\W$)/i"; $repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0">'; } diff --git a/phpBB/templates/subSilver/jumpbox.tpl b/phpBB/templates/subSilver/jumpbox.tpl index 69ca29e154..4b76d3aae3 100644 --- a/phpBB/templates/subSilver/jumpbox.tpl +++ b/phpBB/templates/subSilver/jumpbox.tpl @@ -1,5 +1,5 @@ -<form method="post" action="{S_JUMPBOX_ACTION}"> +<form method="post" name="jumpbox" action="{S_JUMPBOX_ACTION}"> <table cellspacing="0" cellpadding="0" border="0"> <tr> <td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}: {S_JUMPBOX_LIST} |