diff options
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
-rw-r--r-- | phpBB/includes/functions_messenger.php | 4 | ||||
-rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index b3792dd8b9..38017255b4 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -@define('PHPBB_VERSION', '3.2.0-b3-dev'); +@define('PHPBB_VERSION', '3.2.0-RC2-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 10d4910494..fa9ed84a34 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -687,10 +687,10 @@ class queue */ function queue() { - global $phpEx, $phpbb_root_path, $phpbb_filesystem; + global $phpEx, $phpbb_root_path, $phpbb_filesystem, $phpbb_container; $this->data = array(); - $this->cache_file = "{$phpbb_root_path}cache/queue.$phpEx"; + $this->cache_file = $phpbb_container->getParameter('core.cache_dir') . "queue.$phpEx"; $this->filesystem = $phpbb_filesystem; } diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 130bf60d3a..a9f8e10eef 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -568,7 +568,6 @@ class ucp_profile $vars = array('sql_ary'); extract($phpbb_dispatcher->trigger_event('core.ucp_profile_modify_signature_sql_ary', compact($vars))); - $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $user->data['user_id']; |