diff options
| -rw-r--r-- | phpBB/composer.lock | 154 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 11 | ||||
| -rw-r--r-- | phpBB/phpbb/session.php | 58 | ||||
| -rw-r--r-- | phpBB/posting.php | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 7 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_test_case_helpers.php | 23 |
6 files changed, 159 insertions, 97 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 74e554f2f0..aaff9a8968 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "hash": "94d0f6dab53f11dab1de63c0ae519ee6", @@ -224,7 +224,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/beee0e5693f7ca8ed16a94294acf53b6e6207e7c", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/6c568ac8b01b33650d9d77b5b6399eed9c18ac94", "reference": "beee0e5693f7ca8ed16a94294acf53b6e6207e7c", "shasum": "" }, @@ -279,12 +279,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Config.git", - "reference": "291e3f1ce92fec71632eada0d492833b41531718" + "reference": "358ec929e494b6f12d8508d88357cbd7383a10ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/291e3f1ce92fec71632eada0d492833b41531718", - "reference": "291e3f1ce92fec71632eada0d492833b41531718", + "url": "https://api.github.com/repos/symfony/Config/zipball/358ec929e494b6f12d8508d88357cbd7383a10ca", + "reference": "358ec929e494b6f12d8508d88357cbd7383a10ca", "shasum": "" }, "require": { @@ -321,7 +321,7 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2015-05-15 14:11:12" + "time": "2015-07-09 16:11:14" }, { "name": "symfony/console", @@ -329,12 +329,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "7e857a2b52b5833ed27d78a6b1b846bd440ee8bd" + "reference": "fd85e7517e79a2bceafcee8f7e8b7bbd0919a90a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/7e857a2b52b5833ed27d78a6b1b846bd440ee8bd", - "reference": "7e857a2b52b5833ed27d78a6b1b846bd440ee8bd", + "url": "https://api.github.com/repos/symfony/Console/zipball/fd85e7517e79a2bceafcee8f7e8b7bbd0919a90a", + "reference": "fd85e7517e79a2bceafcee8f7e8b7bbd0919a90a", "shasum": "" }, "require": { @@ -378,7 +378,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2015-05-15 14:11:12" + "time": "2015-07-16 12:22:14" }, { "name": "symfony/debug", @@ -386,12 +386,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Debug.git", - "reference": "eda866deb149108bfeb4185593083919b186a463" + "reference": "d1114d892ae70f833871dc55599f17084191efaa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/eda866deb149108bfeb4185593083919b186a463", - "reference": "eda866deb149108bfeb4185593083919b186a463", + "url": "https://api.github.com/repos/symfony/Debug/zipball/d1114d892ae70f833871dc55599f17084191efaa", + "reference": "d1114d892ae70f833871dc55599f17084191efaa", "shasum": "" }, "require": { @@ -438,7 +438,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2015-05-15 14:11:12" + "time": "2015-07-09 16:11:14" }, { "name": "symfony/dependency-injection", @@ -446,12 +446,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/DependencyInjection.git", - "reference": "90a75274cb85bd6f9aaf4a017e5dee616ffe8a1d" + "reference": "f279142fb6bc21e83fcd40e0a01a62ff527268be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/90a75274cb85bd6f9aaf4a017e5dee616ffe8a1d", - "reference": "90a75274cb85bd6f9aaf4a017e5dee616ffe8a1d", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/f279142fb6bc21e83fcd40e0a01a62ff527268be", + "reference": "f279142fb6bc21e83fcd40e0a01a62ff527268be", "shasum": "" }, "require": { @@ -498,7 +498,7 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2015-05-12 15:16:46" + "time": "2015-07-16 10:10:53" }, { "name": "symfony/event-dispatcher", @@ -506,12 +506,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "8766cebf28beac9a45b511d7dba053da9d35eb9f" + "reference": "d7246885b7fe4cb5a2786bda34362d2f0e40b730" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/8766cebf28beac9a45b511d7dba053da9d35eb9f", - "reference": "8766cebf28beac9a45b511d7dba053da9d35eb9f", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/d7246885b7fe4cb5a2786bda34362d2f0e40b730", + "reference": "d7246885b7fe4cb5a2786bda34362d2f0e40b730", "shasum": "" }, "require": { @@ -556,7 +556,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2015-05-12 15:16:46" + "time": "2015-06-24 15:32:32" }, { "name": "symfony/filesystem", @@ -564,12 +564,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "45cc231f1ecac70a8790bf1c88a823af8ce57056" + "reference": "9f70c5625a32b2f1e6fc37222f52b4e0eb437b0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/45cc231f1ecac70a8790bf1c88a823af8ce57056", - "reference": "45cc231f1ecac70a8790bf1c88a823af8ce57056", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/9f70c5625a32b2f1e6fc37222f52b4e0eb437b0e", + "reference": "9f70c5625a32b2f1e6fc37222f52b4e0eb437b0e", "shasum": "" }, "require": { @@ -605,7 +605,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2015-05-15 14:11:12" + "time": "2015-07-09 16:11:14" }, { "name": "symfony/finder", @@ -613,12 +613,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "fd26bdbb67bc8753884eff5767a4f1ee90e2284b" + "reference": "8712d5e8c4ad65e6b936ed9b6a581e5e6a87fddf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/fd26bdbb67bc8753884eff5767a4f1ee90e2284b", - "reference": "fd26bdbb67bc8753884eff5767a4f1ee90e2284b", + "url": "https://api.github.com/repos/symfony/Finder/zipball/8712d5e8c4ad65e6b936ed9b6a581e5e6a87fddf", + "reference": "8712d5e8c4ad65e6b936ed9b6a581e5e6a87fddf", "shasum": "" }, "require": { @@ -654,7 +654,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2015-05-15 14:11:12" + "time": "2015-07-09 16:11:14" }, { "name": "symfony/http-foundation", @@ -662,12 +662,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "06aa08b5d9157abc10bee99712124b8b994d4259" + "reference": "5339030f5af0d6fef7c897130291ac168278289f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/06aa08b5d9157abc10bee99712124b8b994d4259", - "reference": "06aa08b5d9157abc10bee99712124b8b994d4259", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/5339030f5af0d6fef7c897130291ac168278289f", + "reference": "5339030f5af0d6fef7c897130291ac168278289f", "shasum": "" }, "require": { @@ -707,7 +707,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2015-05-15 14:11:12" + "time": "2015-07-16 12:22:14" }, { "name": "symfony/http-kernel", @@ -715,12 +715,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "c587069bb67bea9db7ed8aa82e4fe0c9b7867fa2" + "reference": "f24d2cb4778ecc5f6c8e8f7f31bc4691099a920d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/c587069bb67bea9db7ed8aa82e4fe0c9b7867fa2", - "reference": "c587069bb67bea9db7ed8aa82e4fe0c9b7867fa2", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/f24d2cb4778ecc5f6c8e8f7f31bc4691099a920d", + "reference": "f24d2cb4778ecc5f6c8e8f7f31bc4691099a920d", "shasum": "" }, "require": { @@ -745,7 +745,7 @@ "symfony/finder": "~2.0,>=2.0.5|~3.0.0", "symfony/phpunit-bridge": "~2.7|~3.0.0", "symfony/process": "~2.0,>=2.0.5|~3.0.0", - "symfony/routing": "~2.2|~3.0.0", + "symfony/routing": "~2.8|~3.0.0", "symfony/stopwatch": "~2.3|~3.0.0", "symfony/templating": "~2.2|~3.0.0", "symfony/translation": "~2.0,>=2.0.5|~3.0.0", @@ -787,7 +787,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2015-05-15 14:11:12" + "time": "2015-07-09 16:11:14" }, { "name": "symfony/routing", @@ -795,12 +795,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "76b18edcf09a967590d6e132851d0f964866e2e8" + "reference": "9e797cd70762db18d87c59dc6bc1ab7c3eb963ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/76b18edcf09a967590d6e132851d0f964866e2e8", - "reference": "76b18edcf09a967590d6e132851d0f964866e2e8", + "url": "https://api.github.com/repos/symfony/Routing/zipball/9e797cd70762db18d87c59dc6bc1ab7c3eb963ed", + "reference": "9e797cd70762db18d87c59dc6bc1ab7c3eb963ed", "shasum": "" }, "require": { @@ -858,7 +858,7 @@ "uri", "url" ], - "time": "2015-05-15 14:11:12" + "time": "2015-07-09 16:11:14" }, { "name": "symfony/security-core", @@ -866,12 +866,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "2c218453a47553aadc3fef60f44b9c10cdee34ac" + "reference": "8253e027bf8a1c9c573a7b3c494027847058c959" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/2c218453a47553aadc3fef60f44b9c10cdee34ac", - "reference": "2c218453a47553aadc3fef60f44b9c10cdee34ac", + "url": "https://api.github.com/repos/symfony/security-core/zipball/8253e027bf8a1c9c573a7b3c494027847058c959", + "reference": "8253e027bf8a1c9c573a7b3c494027847058c959", "shasum": "" }, "require": { @@ -921,7 +921,7 @@ ], "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", - "time": "2015-05-15 14:11:12" + "time": "2015-07-09 16:11:14" }, { "name": "symfony/security-csrf", @@ -983,12 +983,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/TwigBridge.git", - "reference": "2e072a1ff57989abf76a04dc6b02838b7bdccb44" + "reference": "a02e3a8ff1f8eda04d0e0655d2cefcbe9ecc4e14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/2e072a1ff57989abf76a04dc6b02838b7bdccb44", - "reference": "2e072a1ff57989abf76a04dc6b02838b7bdccb44", + "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/a02e3a8ff1f8eda04d0e0655d2cefcbe9ecc4e14", + "reference": "a02e3a8ff1f8eda04d0e0655d2cefcbe9ecc4e14", "shasum": "" }, "require": { @@ -1053,7 +1053,7 @@ ], "description": "Symfony Twig Bridge", "homepage": "https://symfony.com", - "time": "2015-05-20 08:44:53" + "time": "2015-07-09 16:11:14" }, { "name": "symfony/yaml", @@ -1061,12 +1061,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "2396832f6f9ab2b8f62f00b5d3f2e722fc773d65" + "reference": "000e7fc2653335cd42c6d21405dac1c74224a387" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/2396832f6f9ab2b8f62f00b5d3f2e722fc773d65", - "reference": "2396832f6f9ab2b8f62f00b5d3f2e722fc773d65", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/000e7fc2653335cd42c6d21405dac1c74224a387", + "reference": "000e7fc2653335cd42c6d21405dac1c74224a387", "shasum": "" }, "require": { @@ -1102,7 +1102,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-05-12 15:16:46" + "time": "2015-07-01 14:16:54" }, { "name": "twig/twig", @@ -1225,12 +1225,12 @@ "target-dir": "Guzzle/Common", "source": { "type": "git", - "url": "https://github.com/guzzle/common.git", + "url": "https://github.com/Guzzle3/common.git", "reference": "bf73c87375f60861f8c7ccc7b95878023ade5306" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/common/zipball/bf73c87375f60861f8c7ccc7b95878023ade5306", + "url": "https://api.github.com/repos/Guzzle3/common/zipball/bf73c87375f60861f8c7ccc7b95878023ade5306", "reference": "bf73c87375f60861f8c7ccc7b95878023ade5306", "shasum": "" }, @@ -1269,12 +1269,12 @@ "target-dir": "Guzzle/Http", "source": { "type": "git", - "url": "https://github.com/guzzle/http.git", + "url": "https://github.com/Guzzle3/http.git", "reference": "1034125dfd906b73119e535f03153a62fccb1989" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/http/zipball/1034125dfd906b73119e535f03153a62fccb1989", + "url": "https://api.github.com/repos/Guzzle3/http/zipball/1034125dfd906b73119e535f03153a62fccb1989", "reference": "1034125dfd906b73119e535f03153a62fccb1989", "shasum": "" }, @@ -1326,12 +1326,12 @@ "target-dir": "Guzzle/Parser", "source": { "type": "git", - "url": "https://github.com/guzzle/parser.git", + "url": "https://github.com/Guzzle3/parser.git", "reference": "a25c2ddda1c52fb69a4ee56eb530b13ddd9573c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/parser/zipball/a25c2ddda1c52fb69a4ee56eb530b13ddd9573c2", + "url": "https://api.github.com/repos/Guzzle3/parser/zipball/a25c2ddda1c52fb69a4ee56eb530b13ddd9573c2", "reference": "a25c2ddda1c52fb69a4ee56eb530b13ddd9573c2", "shasum": "" }, @@ -1370,12 +1370,12 @@ "target-dir": "Guzzle/Stream", "source": { "type": "git", - "url": "https://github.com/guzzle/stream.git", + "url": "https://github.com/Guzzle3/stream.git", "reference": "a86111d9ac7db31d65a053c825869409fe8fc83f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/stream/zipball/a86111d9ac7db31d65a053c825869409fe8fc83f", + "url": "https://api.github.com/repos/Guzzle3/stream/zipball/a86111d9ac7db31d65a053c825869409fe8fc83f", "reference": "a86111d9ac7db31d65a053c825869409fe8fc83f", "shasum": "" }, @@ -2007,12 +2007,12 @@ "version": "v1.0.2", "source": { "type": "git", - "url": "https://github.com/fabpot/Pimple.git", + "url": "https://github.com/silexphp/Pimple.git", "reference": "ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Pimple/zipball/ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94", "reference": "ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94", "shasum": "" }, @@ -2454,12 +2454,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/BrowserKit.git", - "reference": "491639704334283b5f1d87bb3298400f1f5cd2bf" + "reference": "4f297d7e00c375b6ab03732e076f65799a73937d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/491639704334283b5f1d87bb3298400f1f5cd2bf", - "reference": "491639704334283b5f1d87bb3298400f1f5cd2bf", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/4f297d7e00c375b6ab03732e076f65799a73937d", + "reference": "4f297d7e00c375b6ab03732e076f65799a73937d", "shasum": "" }, "require": { @@ -2501,7 +2501,7 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2015-05-12 15:16:46" + "time": "2015-07-09 16:11:14" }, { "name": "symfony/css-selector", @@ -2562,12 +2562,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/DomCrawler.git", - "reference": "3a523d1725d5835e4a7277358190e7efae7d872f" + "reference": "3aed431721a4a779d1ec30210bd53075da9623f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/3a523d1725d5835e4a7277358190e7efae7d872f", - "reference": "3a523d1725d5835e4a7277358190e7efae7d872f", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/3aed431721a4a779d1ec30210bd53075da9623f5", + "reference": "3aed431721a4a779d1ec30210bd53075da9623f5", "shasum": "" }, "require": { @@ -2607,7 +2607,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2015-05-12 15:16:46" + "time": "2015-07-09 16:11:14" }, { "name": "symfony/process", @@ -2615,12 +2615,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "daf96f1491cf0b8d8de60e6d3b5fda8e502b3798" + "reference": "25d74c90d79e66905013714d8d188e4ccb5ff466" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/daf96f1491cf0b8d8de60e6d3b5fda8e502b3798", - "reference": "daf96f1491cf0b8d8de60e6d3b5fda8e502b3798", + "url": "https://api.github.com/repos/symfony/Process/zipball/25d74c90d79e66905013714d8d188e4ccb5ff466", + "reference": "25d74c90d79e66905013714d8d188e4ccb5ff466", "shasum": "" }, "require": { @@ -2656,7 +2656,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2015-05-15 14:11:12" + "time": "2015-07-01 14:16:54" } ], "aliases": [], diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 00cdc03f14..f53f40d66a 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -559,6 +559,17 @@ function change_poster(&$post_info, $userdata) $post_info = $post_info[$post_id]; + /** + * This event allows you to perform additional tasks after changing a post's poster + * + * @event core.mcp_change_poster_after + * @var array userdata Information on a post's new poster + * @var array post_info Information on the affected post + * @since 3.1.6-RC1 + */ + $vars = array('userdata', 'post_info'); + extract($phpbb_dispatcher->trigger_event('core.mcp_change_poster_after', compact($vars))); + // Now add log entry $phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_MCP_CHANGE_POSTER', false, array( 'forum_id' => $post_info['forum_id'], diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 6154f384f3..e06df191f5 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -527,7 +527,7 @@ class session */ function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true) { - global $SID, $_SID, $db, $config, $cache, $phpbb_root_path, $phpEx, $phpbb_container; + global $SID, $_SID, $db, $config, $cache, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher; $this->data = array(); @@ -902,6 +902,19 @@ class session $_SID = ''; } + $session_data = $sql_ary; + /** + * Event to send new session data to extension + * Read-only event + * + * @event core.session_create_after + * @var array session_data Associative array of session keys to be updated + * @since 3.1.6-RC1 + */ + $vars = array('session_data'); + extract($phpbb_dispatcher->trigger_event('core.session_create_after', compact($vars))); + unset($session_data); + return true; } @@ -915,13 +928,30 @@ class session */ function session_kill($new_session = true) { - global $SID, $_SID, $db, $config, $phpbb_root_path, $phpEx, $phpbb_container; + global $SID, $_SID, $db, $config, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher; $sql = 'DELETE FROM ' . SESSIONS_TABLE . " WHERE session_id = '" . $db->sql_escape($this->session_id) . "' AND session_user_id = " . (int) $this->data['user_id']; $db->sql_query($sql); + $user_id = (int) $this->data['user_id']; + $session_id = $this->session_id; + /** + * Event to send session kill information to extension + * Read-only event + * + * @event core.session_kill_after + * @var int user_id user_id of the session user. + * @var string session_id current user's session_id + * @var bool new_session should we create new session for user + * @since 3.1.6-RC1 + */ + $vars = array('user_id', 'session_id', 'new_session'); + extract($phpbb_dispatcher->trigger_event('core.session_kill_after', compact($vars))); + unset($user_id); + unset($session_id); + // Allow connecting logout with external auth method logout /* @var $provider_collection \phpbb\auth\provider_collection */ $provider_collection = $phpbb_container->get('auth.provider_collection'); @@ -990,7 +1020,7 @@ class session */ function session_gc() { - global $db, $config, $phpbb_root_path, $phpEx, $phpbb_container; + global $db, $config, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher; $batch_size = 10; @@ -1059,6 +1089,14 @@ class session $db->sql_query($sql); } + /** + * Event to trigger extension on session_gc + * + * @event core.session_gc_after + * @since 3.1.6-RC1 + */ + $phpbb_dispatcher->dispatch('core.session_gc_after'); + return; } @@ -1552,12 +1590,24 @@ class session */ public function update_session($session_data, $session_id = null) { - global $db; + global $db, $phpbb_dispatcher; $session_id = ($session_id) ? $session_id : $this->session_id; $sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $session_data) . " WHERE session_id = '" . $db->sql_escape($session_id) . "'"; $db->sql_query($sql); + + /** + * Event to send update session information to extension + * Read-only event + * + * @event core.update_session_after + * @var array session_data Associative array of session keys to be updated + * @var string session_id current user's session_id + * @since 3.1.6-RC1 + */ + $vars = array('session_data', 'session_id'); + extract($phpbb_dispatcher->trigger_event('core.update_session_after', compact($vars))); } } diff --git a/phpBB/posting.php b/phpBB/posting.php index eafae332c6..7f89bdbadf 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1866,6 +1866,7 @@ if (($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_ * @var int post_id ID of the post * @var int topic_id ID of the topic * @var int forum_id ID of the forum +* @var int draft_id ID of the draft * @var bool submit Whether or not the form has been submitted * @var bool preview Whether or not the post is being previewed * @var bool save Whether or not a draft is being saved @@ -1888,6 +1889,7 @@ if (($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_ * delete, cancel, refresh, error, page_data, message_parser * @change 3.1.2-RC1 Removed 'delete' var as it does not exist * @change 3.1.5-RC1 Added poll variables to the page_data array +* @change 3.1.6-RC1 Added 'draft_id' var */ $vars = array( 'post_data', @@ -1901,6 +1903,7 @@ $vars = array( 'post_id', 'topic_id', 'forum_id', + 'draft_id', 'submit', 'preview', 'save', diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index c126b9e3c2..702960f47c 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -327,6 +327,7 @@ ul.linklist li.responsive-menu { ul.linklist li.responsive-menu a.responsive-menu-link { display: inline-block; margin: 0 5px; + font-size: 1.455em; position: relative; width: 16px; line-height: 1.2em; @@ -1257,12 +1258,14 @@ ul.linklist:after, } #quick-links a.responsive-menu-link:before { - font-size: 1.6em; + font-size: 1.455em; line-height: 16.5px; } .compact #quick-links a.responsive-menu-link { - font-size: 0; + width: 0; + overflow: hidden; + white-space: nowrap; } .compact .icon-notification > a > span, .compact .icon-pm > a > span { diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 70bd309653..c0f278c130 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -435,20 +435,15 @@ class phpbb_test_case_helpers // Create a path_helper if (!$container->has('path_helper') || $container->getDefinition('path_helper')->isSynthetic()) { - $path_helper = new \phpbb\path_helper( - new \phpbb\symfony_request( - new phpbb_mock_request() - ), - new \phpbb\filesystem(), - $this->test_case->getMock('\phpbb\request\request'), - $phpbb_root_path, - $phpEx - ); - - $container->set( - 'path_helper', - $path_helper - ); + $path_helper = $this->test_case->getMockBuilder('phpbb\\path_helper') + ->disableOriginalConstructor() + ->setMethods(array('get_web_root_path')) + ->getMock(); + $path_helper->expects($this->test_case->any()) + ->method('get_web_root_path') + ->will($this->test_case->returnValue('phpBB/')); + + $container->set('path_helper', $path_helper); } else { |