diff options
| author | Sem <sembrestels@riseup.net> | 2013-03-13 02:13:17 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-03-13 02:13:17 +0100 |
| commit | d730a0c5861c2e79faa3e58dd2b171ca4d197c6f (patch) | |
| tree | cb4658e1c60a60c5f663845d49b108dd4608a89a /engine/classes/ODDRelationship.php | |
| parent | 0fb3e5396d10d21323eb3bbc04727fd4a5a6d06d (diff) | |
| parent | 34b14b305f5a106316fdc403c4ce80b25e89b51d (diff) | |
| download | elgg-d730a0c5861c2e79faa3e58dd2b171ca4d197c6f.tar.gz elgg-d730a0c5861c2e79faa3e58dd2b171ca4d197c6f.tar.bz2 | |
Merge tag '1.8.14' of git://github.com/Elgg/Elgg into foxglove-3
Elgg 1.8.14
Conflicts:
mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
Diffstat (limited to 'engine/classes/ODDRelationship.php')
| -rw-r--r-- | engine/classes/ODDRelationship.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/classes/ODDRelationship.php b/engine/classes/ODDRelationship.php index 2906b1c73..8b1fe217b 100644 --- a/engine/classes/ODDRelationship.php +++ b/engine/classes/ODDRelationship.php @@ -10,9 +10,9 @@ class ODDRelationship extends ODD { /** * New ODD Relationship * - * @param unknown_type $uuid1 First UUID - * @param unknown_type $type Type of telationship - * @param unknown_type $uuid2 Second UUId + * @param string $uuid1 First UUID + * @param string $type Type of telationship + * @param string $uuid2 Second UUId */ function __construct($uuid1, $type, $uuid2) { parent::__construct(); @@ -25,7 +25,7 @@ class ODDRelationship extends ODD { /** * Returns 'relationship' * - * @return 'relationship' + * @return string 'relationship' */ protected function getTagName() { return "relationship"; |