diff options
author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-26 15:32:27 -0600 |
---|---|---|
committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-26 15:32:27 -0600 |
commit | a01da0c1ee83d15e4c466a80db78fd7e9859e637 (patch) | |
tree | 651cd313ae0d225d67fb0a4f1755d7f87b2546b7 /phpBB/includes/db/migration/exception.php | |
parent | d2295b3d1f191710916b12980e13c97419ecf0ae (diff) | |
parent | 80bd78a5e5e1069773c05073cd47662a311bda79 (diff) | |
download | forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.gz forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.bz2 forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.xz forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.zip |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/includes/db/migration/exception.php')
-rw-r--r-- | phpBB/includes/db/migration/exception.php | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/phpBB/includes/db/migration/exception.php b/phpBB/includes/db/migration/exception.php index ffdcd97780..e84330dd71 100644 --- a/phpBB/includes/db/migration/exception.php +++ b/phpBB/includes/db/migration/exception.php @@ -52,4 +52,28 @@ class phpbb_db_migration_exception extends \Exception { return $this->message . ': ' . var_export($this->parameters, true); } + + /** + * Get the parameters + * + * @return array + */ + public function getParameters() + { + return $this->parameters; + } + + /** + * Get localised message (with $user->lang()) + * + * @param phpbb_user $user + * @return string + */ + public function getLocalisedMessage(phpbb_user $user) + { + $parameters = $this->getParameters(); + array_unshift($parameters, $this->getMessage()); + + return call_user_func_array(array($user, 'lang'), $parameters); + } } |