summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2016-02-09 10:40:00 +0100
committerJoas Schilling <nickvergessen@owncloud.com>2016-02-09 10:40:00 +0100
commit349f3bf54a81af8467a62f1681bcaca172262446 (patch)
tree9c0d5797453a9d2120e4f871cc73ce605f7fb7ff
parent08f0dc906780be699aa9ff8c10faaea0be44855d (diff)
downloadnextcloud-server-349f3bf54a81af8467a62f1681bcaca172262446.tar.gz
nextcloud-server-349f3bf54a81af8467a62f1681bcaca172262446.zip
More fixes
-rw-r--r--lib/private/share/share.php4
-rw-r--r--lib/private/template.php22
-rw-r--r--lib/private/updater.php1
3 files changed, 9 insertions, 18 deletions
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 51d98fff792..b09adf1aa99 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -2300,10 +2300,10 @@ class Share extends Constants {
/**
* @param string $itemType
* @param string $itemSource
- * @param integer $shareType
+ * @param int $shareType
* @param string $shareWith
* @param string $uidOwner
- * @param integer $permissions
+ * @param int $permissions
* @param string|null $itemSourceName
* @param null|\DateTime $expirationDate
*/
diff --git a/lib/private/template.php b/lib/private/template.php
index d068150b33b..bc706e29344 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -53,26 +53,18 @@ class OC_Template extends \OC\Template\Base {
/** @var string */
protected $app; // app id
+ protected static $initTemplateEngineFirstRun = true;
+
/**
* Constructor
+ *
* @param string $app app providing the template
* @param string $name of the template file (without suffix)
- * @param string $renderAs = ""; produce a full page
+ * @param string $renderAs If $renderAs is set, OC_Template will try to
+ * produce a full page in the according layout. For
+ * now, $renderAs can be set to "guest", "user" or
+ * "admin".
* @param bool $registerCall = true
- * @return OC_Template object
- *
- * This function creates an OC_Template object.
- *
- * If $renderAs is set, OC_Template will try to produce a full page in the
- * according layout. For now, $renderAs can be set to "guest", "user" or
- * "admin".
- */
-
- protected static $initTemplateEngineFirstRun = true;
-
- /**
- * @param string $app
- * @param string $name
*/
public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
// Read the selected theme from the config file
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 1c5e8a3a26e..78457ba3a80 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -286,7 +286,6 @@ class Updater extends BasicEmitter {
* @param string $installedVersion previous version from which to upgrade from
*
* @throws \Exception
- * @return boolean|null true if the operation succeeded, false otherwise
*/
private function doUpgrade($currentVersion, $installedVersion) {
// Stop update if the update is over several major versions