diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-09-28 20:50:06 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-09-28 20:50:06 +0200 |
| commit | 2fd2fb94cf4577b9a48c9d87cd0c14c852667a9f (patch) | |
| tree | 60b0cbb3f2571eed55747b9d0baf9d70085101c6 | |
| parent | 7d73d1ff83ea34c77b7d53a4c3a8a6444c368bfb (diff) | |
| parent | 06c980f1ec61816846557e88832acd9b1c7644e5 (diff) | |
| download | forums-2fd2fb94cf4577b9a48c9d87cd0c14c852667a9f.tar forums-2fd2fb94cf4577b9a48c9d87cd0c14c852667a9f.tar.gz forums-2fd2fb94cf4577b9a48c9d87cd0c14c852667a9f.tar.bz2 forums-2fd2fb94cf4577b9a48c9d87cd0c14c852667a9f.tar.xz forums-2fd2fb94cf4577b9a48c9d87cd0c14c852667a9f.zip | |
Merge pull request #4468 from markshawtoronto/ticket/14799
[ticket/14799] purge_notifications() should not leave open transactions.
* markshawtoronto/ticket/14799:
[ticket/14799] purge_notifications() should not leave open transactions.
[3.1.x] Increase version for 3.1.11 development
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/manager.php | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index 0c5e8e1e87..b732521e3e 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> - <property name="newversion" value="3.1.10-RC1" /> + <property name="newversion" value="3.1.11-dev" /> <property name="prevversion" value="3.1.9" /> <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8" /> <!-- no configuration should be needed beyond this point --> diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 53c26026d1..cafb819ffc 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.1.10-RC1'); +define('PHPBB_VERSION', '3.1.11-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 4214fb4e1b..e13b23e4c4 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -273,7 +273,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.10-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.11-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index ecba8938f2..f5663f4b34 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -945,6 +945,7 @@ class manager { if (!isset($this->notification_types[$notification_type_name]) && !isset($this->notification_types['notification.type.' . $notification_type_name])) { + $this->db->sql_transaction('rollback'); throw new \phpbb\notification\exception($this->user->lang('NOTIFICATION_TYPE_NOT_EXIST', $notification_type_name)); } |