More fixes
This commit is contained in:
parent
08f0dc9067
commit
349f3bf54a
|
@ -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
|
||||
*/
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue