]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix encryption to owncloud user for public link shares
authorBjörn Schießle <schiessle@owncloud.com>
Mon, 22 Apr 2013 12:30:10 +0000 (14:30 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 22 Apr 2013 12:30:10 +0000 (14:30 +0200)
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/util.php
lib/public/share.php

index f23423062b97dcec6673456d0f572995707db7d2..6fb1f128b5e6984e50dc903075f3c6563a9dcdf0 100755 (executable)
@@ -54,7 +54,7 @@ class Keymanager {
                
                \OC_FileProxy::$enabled = false;
                
-               return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
+               return $view->file_get_contents( '/public-keys/' . $userId . '.public.key' );
                
                \OC_FileProxy::$enabled = true;
                
index 1ba339c15df3a7182e8bde0e0425ef0e887d9330..143ba69f25448e1d564326fb1dfe53177f399035 100644 (file)
@@ -668,7 +668,7 @@ class Util {
                        // public system user 'ownCloud' (for public shares)
                        if ( 
                                $util->ready() 
-                               or $user == 'ownCloud' 
+                               or $user == 'owncloud'
                        ) {
                        
                                // Construct array of ready UIDs for Keymanager{}
index 9fd8eb42fb7b1b85c4095ea9be9422a80c9cdd6c..5cd556c6acb34fa3823a8a9576d6b677d1152be8 100644 (file)
@@ -200,7 +200,7 @@ class Share {
                        }
                        
                        if ($result->fetchRow()) {
-                               $shares[] = "ownCloud";
+                               $shares[] = "owncloud";
                        }
                }
                // Include owner in list of users, if requested