From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 2 Oct 2016 09:54:42 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_2~26
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f0bd863f261fe57dc4164f92aef53ec118b93ecc;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next

# Conflicts:
#	wcfsetup/install/files/js/WCF.Combined.min.js
---

f0bd863f261fe57dc4164f92aef53ec118b93ecc
diff --cc wcfsetup/install/files/lib/data/comment/StructuredComment.class.php
index 13871bb936,1b3f5ab729..fd2cc56672
--- a/wcfsetup/install/files/lib/data/comment/StructuredComment.class.php
+++ b/wcfsetup/install/files/lib/data/comment/StructuredComment.class.php
@@@ -167,10 -160,10 +167,10 @@@ class StructuredComment extends Databas
  	}
  	
  	/**
 -	 * @see	\Iterator::key()
 +	 * @inheritDoc
  	 */
  	public function key() {
- 		return $this->postition;
+ 		return $this->position;
  	}
  	
  	/**