diff options
author | Robin Appelman <icewind@owncloud.com> | 2012-11-07 17:18:56 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2012-11-07 17:18:56 +0100 |
commit | 961ff01a93dd69cb12196a1b8507cce925e74fbc (patch) | |
tree | 4956c9a42d6286b0851ca73641439e5c002f6a9a /apps/files/appinfo | |
parent | 4b940955ddb3266f625eae83da412a655efef319 (diff) | |
parent | 5cad2d7ccc3d2b4ccd9e1b090e28787f1c28b6ca (diff) | |
download | nextcloud-server-961ff01a93dd69cb12196a1b8507cce925e74fbc.tar.gz nextcloud-server-961ff01a93dd69cb12196a1b8507cce925e74fbc.zip |
merge master into filesystem
Diffstat (limited to 'apps/files/appinfo')
-rw-r--r-- | apps/files/appinfo/update.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php index 738864d7cff..29782ec643e 100644 --- a/apps/files/appinfo/update.php +++ b/apps/files/appinfo/update.php @@ -5,10 +5,10 @@ $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(); + $updateQuery = OC_DB::prepare('UPDATE `*PREFIX*properties` SET `propertyname` = ? WHERE `userid` = ? AND `propertypath` = ?'); while( $row = $result->fetchRow()) { 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"] )); + $updateQuery->execute(array('{DAV:}' + $row["propertyname"], $row["userid"], $row["propertypath"])); } } } |