aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/cache
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-08-07 12:44:10 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-08-07 12:44:10 +0200
commit28224bad70fe5c2d912d96f2f35e4e5d99301c71 (patch)
treef022b99cff7c80074c4f2e82d40e273b56f0a973 /phpBB/phpbb/cache
parentf8046cc2533f9f87eb914564c4e0e1215b0f007f (diff)
parent2f44a865a01d1c9d1198484c7a9e841c22ef267d (diff)
downloadforums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar
forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.gz
forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.bz2
forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.xz
forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12557] Fix load active module description [ticket/12557] Fix php file description [ticket/12557] Fix post data description for notifications [ticket/12557] Fix pass by reference doc blocks [ticket/12557] Fix doc block in extension base class [ticket/12557] Fix doc block in mimetype guesser [ticket/12557] Fix var $preserve_cr description [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Template fixes [ticket/12557] Search, cron and profilefields fixes [ticket/12557] Notification fixes [ticket/12557] Fix doc block errors found by Sami pt1 [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami
Diffstat (limited to 'phpBB/phpbb/cache')
-rw-r--r--phpBB/phpbb/cache/service.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/cache/service.php b/phpBB/phpbb/cache/service.php
index d6bf150384..b890d90558 100644
--- a/phpBB/phpbb/cache/service.php
+++ b/phpBB/phpbb/cache/service.php
@@ -47,7 +47,7 @@ class service
protected $phpbb_root_path;
/**
- * PHP extension.
+ * PHP file extension.
*
* @var string
*/
@@ -60,7 +60,7 @@ class service
* @param \phpbb\config\config $config The config
* @param \phpbb\db\driver\driver_interface $db Database connection
* @param string $phpbb_root_path Root path
- * @param string $php_ext PHP extension
+ * @param string $php_ext PHP file extension
*/
public function __construct(\phpbb\cache\driver\driver_interface $driver, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, $phpbb_root_path, $php_ext)
{