summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2017-07-27 17:25:09 +0200
committerThomas Citharel <tcit@tcit.fr>2017-09-15 15:23:10 +0200
commiteb51c46549d1fe01fe8fdbefd2303bf597c88b54 (patch)
tree9c713214a4952472650a21f7078ee95c80cab59f /lib
parentecf347bd1aaaeb2cd11b8ffbc60da099c68f1d83 (diff)
downloadnextcloud-server-eb51c46549d1fe01fe8fdbefd2303bf597c88b54.tar.gz
nextcloud-server-eb51c46549d1fe01fe8fdbefd2303bf597c88b54.zip
fix typo and set @since properly
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Diffstat (limited to 'lib')
-rw-r--r--lib/public/AppFramework/Http/ContentSecurityPolicy.php2
-rw-r--r--lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php10
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/public/AppFramework/Http/ContentSecurityPolicy.php b/lib/public/AppFramework/Http/ContentSecurityPolicy.php
index 0a792fa2630..b17dc070fe1 100644
--- a/lib/public/AppFramework/Http/ContentSecurityPolicy.php
+++ b/lib/public/AppFramework/Http/ContentSecurityPolicy.php
@@ -85,6 +85,6 @@ class ContentSecurityPolicy extends EmptyContentSecurityPolicy {
/** @var array Domains from which web-workers and nested browsing content can load elements */
protected $allowedChildSrcDomains = [];
- /** @var array Domains which can embeed this Nextcloud instance */
+ /** @var array Domains which can embed this Nextcloud instance */
protected $allowedFrameAncestors = [];
}
diff --git a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
index d0536259f7a..5902d4ddbeb 100644
--- a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
+++ b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
@@ -68,7 +68,7 @@ class EmptyContentSecurityPolicy {
protected $allowedFontDomains = null;
/** @var array Domains from which web-workers and nested browsing content can load elements */
protected $allowedChildSrcDomains = null;
- /** @var array Domains which can embeed this Nextcloud instance */
+ /** @var array Domains which can embed this Nextcloud instance */
protected $allowedFrameAncestors = null;
/**
@@ -329,11 +329,11 @@ class EmptyContentSecurityPolicy {
}
/**
- * Domains which can embeed an iFrame of the Nextcloud instance
+ * Domains which can embed an iFrame of the Nextcloud instance
*
* @param string $domain
* @return $this
- * @since 12.x
+ * @since 13.0.0
*/
public function addAllowedFrameAncestorDomain($domain) {
$this->allowedFrameAncestors[] = $domain;
@@ -341,11 +341,11 @@ class EmptyContentSecurityPolicy {
}
/**
- * Domains which can embeed an iFrame of the Nextcloud instance
+ * Domains which can embed an iFrame of the Nextcloud instance
*
* @param string $domain
* @return $this
- * @since 12.x
+ * @since 13.0.0
*/
public function disallowFrameAncestorDomain($domain) {
$this->allowedFrameAncestors = array_diff($this->allowedFrameAncestors, [$domain]);