Merge pull request #14615 from nextcloud/fix/dev-manual-critical

Author: skjnldsv

developer_manual/basics/public_share_template.rst

@@ -64,19 +64,37 @@ It is possible to override the default public share view. This is possible by im
             ...; // More initial state that you might need in your view.
 
             // OpenGraph Support: http://ogp.me/
-            Util::addHeader('meta', ['property' => "og:title", 'content' => $this->l10n->t("Encrypted share")]);
-            Util::addHeader('meta', ['property' => "og:description", 'content' => $this->defaults->getName() . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : '')]);
-            Util::addHeader('meta', ['property' => "og:site_name", 'content' => $this->defaults->getName()]);
-            Util::addHeader('meta', ['property' => "og:url", 'content' => $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $token])]);
-            Util::addHeader('meta', ['property' => "og:type", 'content' => "object"]);
-
-            $csp->addAllowedFrameDomain('\'self\'');
-            $response->setContentSecurityPolicy($csp);
+            Util::addHeader('meta', [
+                'property' => "og:title",
+                'content' => $this->l10n->t("Encrypted share"),
+            ]);
+            Util::addHeader('meta', [
+                'property' => "og:description",
+                'content' => $this->defaults->getName()
+                    . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''),
+            ]);
+            Util::addHeader('meta', [
+                'property' => "og:site_name",
+                'content' => $this->defaults->getName(),
+            ]);
+            Util::addHeader('meta', [
+                'property' => "og:url",
+                'content' => $this->urlGenerator->linkToRouteAbsolute(
+                    'files_sharing.sharecontroller.showShare',
+                    ['token' => $token]
+                ),
+            ]);
+            Util::addHeader('meta', [
+                'property' => "og:type",
+                'content' => "object",
+            ]);
 
             $response = new PublicTemplateResponse(Application::APP_ID, 'myCustomTemplateFileName', []);
             $response->setHeaderTitle($this->l10n->t("My custom title"));
 
             $csp = new ContentSecurityPolicy();
+            $csp->addAllowedFrameDomain('\'self\'');
+            $response->setContentSecurityPolicy($csp);
 
             return $response;
         }

developer_manual/basics/storage/database.rst

@@ -172,7 +172,7 @@ To create a mapper, inherit from the mapper base class and call the parent const
                ->setMaxResults($limit)
                ->setFirstResult($offset);
 
-            return $this->findEntities($sql);
+            return $this->findEntities($qb);
         }
 
 

developer_manual/digging_deeper/projects.rst

@@ -58,7 +58,7 @@ In order to add your own resource type, we need to create a class implementing t
                 'id' => $resource->getId(),
                 'name' => $item->getTitle(),
                 'link' => $resourceUrl,
-                'iconUrl' => $favicon,
+                'iconUrl' => $icon,
             ];
         }
 

developer_manual/digging_deeper/users.rst

@@ -218,10 +218,10 @@ Nextcloud users can be defined as managers of other users. This is an informatio
             $managers = array_map(function(string $uid) {
                 return $this->userManager->get($uid);
             }, $managerUids));
-            // Remove and managers that no longer exist as user
+            // Remove any managers that no longer exist as users
             $existingManagers = array_filter($managers);
             $user->setManagerUids(array_map(function(IUser $admin) {
-                return $user->getUID();
+                return $admin->getUID();
             }, $existingManagers));
         }
     }