diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-10-17 16:38:11 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-10-17 16:38:11 +0200 |
| commit | 6081bfa2bcbe121e373486273ecce58a49e6fa97 (patch) | |
| tree | f2504800c66919a53eff9323724b493079569495 /apps/files/appinfo | |
| parent | c2b4e534534e083147bbad9b564179832cfa2912 (diff) | |
| parent | 44287d680bd0e8799724a7595db43c0fafcaff40 (diff) | |
| download | nextcloud-server-6081bfa2bcbe121e373486273ecce58a49e6fa97.tar.gz nextcloud-server-6081bfa2bcbe121e373486273ecce58a49e6fa97.zip | |
Merge branch 'master' into routing
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
Diffstat (limited to 'apps/files/appinfo')
| -rw-r--r-- | apps/files/appinfo/info.xml | 2 | ||||
| -rw-r--r-- | apps/files/appinfo/update.php | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index e58f83c5a01..0a1b196b06f 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -5,7 +5,7 @@ <description>File Management</description> <licence>AGPL</licence> <author>Robin Appelman</author> - <require>4</require> + <require>4.9</require> <shipped>true</shipped> <standalone/> <default_enable/> diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php index d963b754772..bcbbc6035fa 100644 --- a/apps/files/appinfo/update.php +++ b/apps/files/appinfo/update.php @@ -1,16 +1,16 @@ <?php -// fix webdav properties,add namespace in front of the property, update for OC4.5
-$installedVersion=OCP\Config::getAppValue('files', 'installed_version');
-if (version_compare($installedVersion, '1.1.6', '<')) {
- $query = OC_DB::prepare( "SELECT propertyname, propertypath, userid FROM `*PREFIX*properties`" );
- $result = $query->execute();
+// fix webdav properties,add namespace in front of the property, update for OC4.5 +$installedVersion=OCP\Config::getAppValue('files', 'installed_version'); +if (version_compare($installedVersion, '1.1.6', '<')) { + $query = OC_DB::prepare( "SELECT `propertyname`, `propertypath`, `userid` FROM `*PREFIX*properties`" ); + $result = $query->execute(); while( $row = $result->fetchRow()){ - if ( $row["propertyname"][0] != '{' ) {
- $query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertyname = ? WHERE userid = ? AND propertypath = ?' );
+ if ( $row["propertyname"][0] != '{' ) { + $query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertyname` = ? WHERE `userid` = ? AND `propertypath` = ?' ); $query->execute( array( '{DAV:}' + $row["propertyname"], $row["userid"], $row["propertypath"] )); - }
- }
+ } + } } //update from OC 3 |