diff options
| author | Hanne Moa <hanne.moa@uninett.no> | 2016-09-15 13:48:43 +0200 |
|---|---|---|
| committer | Hanne Moa <hanne.moa@uninett.no> | 2016-09-15 13:48:43 +0200 |
| commit | b7374dd21c78ddc895f35f45391ba9d06c8aad55 (patch) | |
| tree | 7ca4af6a5f2216d4998b649c5007fa426b671c4d /lib | |
| parent | e6ead78b24a14bf6e25ad2a8a869d5ad11aa1f5e (diff) | |
| download | simplesamlphp-b7374dd21c78ddc895f35f45391ba9d06c8aad55.zip simplesamlphp-b7374dd21c78ddc895f35f45391ba9d06c8aad55.tar.gz simplesamlphp-b7374dd21c78ddc895f35f45391ba9d06c8aad55.tar.bz2 | |
Make `noop()` static
This makes instanciating the Translate/Template-class unnecessary.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/SimpleSAML/Locale/Translate.php | 2 | ||||
| -rw-r--r-- | lib/SimpleSAML/XHTML/Template.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/SimpleSAML/Locale/Translate.php b/lib/SimpleSAML/Locale/Translate.php index 888c077..004a7cd 100644 --- a/lib/SimpleSAML/Locale/Translate.php +++ b/lib/SimpleSAML/Locale/Translate.php @@ -228,7 +228,7 @@ class Translate * * @return string The tag, unchanged. */ - public function noop($tag) + static public function noop($tag) { return $tag; } diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php index af97162..1ebd2fb 100644 --- a/lib/SimpleSAML/XHTML/Template.php +++ b/lib/SimpleSAML/XHTML/Template.php @@ -567,14 +567,14 @@ class SimpleSAML_XHTML_Template /** - * Wrap Language->noop to mark a tag for translation but actually do it later. + * Behave like Language->noop to mark a tag for translation but actually do it later. * * @see \SimpleSAML\Locale\Translate::noop() - * @deprecated This method will be removed in SSP 2.0. Please use \SimpleSAML\Locale\Translate::t() instead. + * @deprecated This method will be removed in SSP 2.0. Please use \SimpleSAML\Locale\Translate::noop() instead. */ - public function noop($tag) + static public function noop($tag) { - return $this->translator->noop($tag); + return $tag; } |