[Pkg-owncloud-commits] [owncloud] 84/273: Merge pull request #9215 from owncloud/officemimetypesupdatefix

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 4b5bf606cbb60ac4e57088aff518e1e0e745873f
Merge: 36f771e 7ee90dd
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Jun 27 11:23:19 2014 +0200

    Merge pull request #9215 from owncloud/officemimetypesupdatefix
    
    Office mime types update fix

 apps/files/appinfo/update.php        |  57 ----------
 lib/private/repair.php               |   7 +-
 lib/repair/repairmimetypes.php       | 125 +++++++++++++++++++++
 tests/lib/repair/repairmimetypes.php | 207 +++++++++++++++++++++++++++++++++++
 4 files changed, 337 insertions(+), 59 deletions(-)

diff --cc lib/private/repair.php
index db2a044,93547fd..14a917b
--- a/lib/private/repair.php
+++ b/lib/private/repair.php
@@@ -78,15 -80,7 +80,16 @@@ class Repair extends BasicEmitter 
  	 * @return array of RepairStep instances
  	 */
  	public static function getBeforeUpgradeRepairSteps() {
- 		return array();
+ 		return array(
+ 		);
  	}
 +
 +	/**
 +	 * {@inheritDoc}
 +	 *
 +	 * Redeclared as public to allow invocation from within the closure above in php 5.3
 +	 */
 +	public function emit($scope, $method, $arguments = array()) {
 +		parent::emit($scope, $method, $arguments);
 +	}
  }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git