diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-12 16:14:07 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-12 16:14:07 +0000 |
| commit | 002dd8155708415b3c1c828789feccbfc087a387 (patch) | |
| tree | 9c7ec297cc23082f2b5894cd28657f5e7b2492fb /phpBB/install | |
| parent | 2ba03a411e561cb943f8ec8f11afc51eaa720275 (diff) | |
| download | forums-002dd8155708415b3c1c828789feccbfc087a387.tar forums-002dd8155708415b3c1c828789feccbfc087a387.tar.gz forums-002dd8155708415b3c1c828789feccbfc087a387.tar.bz2 forums-002dd8155708415b3c1c828789feccbfc087a387.tar.xz forums-002dd8155708415b3c1c828789feccbfc087a387.zip | |
some more fixes
git-svn-id: file:///svn/phpbb/trunk@7875 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 8 | ||||
| -rwxr-xr-x | phpBB/install/install_install.php | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index dfd9a02b3c..8862cf3991 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -661,13 +661,15 @@ if (version_compare($current_version, '3.0.RC2', '<=')) { continue; } + $new_code = str_replace('&', '&', $code); $new_code = str_replace('<', '<', $new_code); $new_code = str_replace('>', '>', $new_code); $new_code = utf8_htmlspecialchars($new_code); + $sql = 'UPDATE ' . SMILIES_TABLE . ' SET code = \'' . $db->sql_escape($new_code) . '\' - WHERE smiley_id = ' . (int)$id; + WHERE smiley_id = ' . (int) $id; $db->sql_query($sql); } @@ -761,6 +763,10 @@ if (version_compare($current_version, '3.0.RC3', '<=')) } } + // Make sure empty smiley codes do not exist + $sql = 'DELETE FROM ' . SMILIES_TABLE . " + WHERE code = ''"; + $db->sql_query($sql); } _write_result($no_updates, $errored, $error_ary); diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 621c91f8cc..68bf1f9a84 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -10,7 +10,7 @@ /** * @todo: check for those functions being 'available'? Though not able to check with function_exists, we need to create test cases -* ini_get(), glob, getimagesize, fsockopen... +* ini_get(), glob, getimagesize, fsockopen, readfile */ /** |