Forgot I got rid of the class field backendTypes, use the array keys of the backends field instead

remotes/origin/stable45
Michael Gapczynski 14 years ago committed by Bart Visscher
parent bc68f14c4b
commit f21fdf14f9
  1. 2
      core/js/share.js
  2. 6
      lib/public/share.php

@ -25,7 +25,7 @@ OC.Share={
if (result && result.status === 'success') {
OC.Share.item = result.data;
}
}});
});
},
share:function(itemType, shareType, shareWith, permissions, callback) {
$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'share', itemType: itemType, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {

@ -355,8 +355,9 @@ class Share {
* @return array
*/
private static function getParentItemTypes($itemType) {
$backendTypes = array_keys(self::$backends);
$parents = array($itemType);
foreach (self::$backendTypes as $type => $backend) {
foreach ($backendTypes as $type => $backend) {
if (in_array($backend->dependsOn, $parents)) {
$parents[] = $type;
}
@ -497,7 +498,8 @@ class Share {
// Check file extension for an equivalent item type to convert to
if ($itemType == 'file') {
$extension = strtolower(substr($item, strrpos($item, '.') + 1));
foreach (self::$backendTypes as $type => $backend) {
$backendTypes = array_keys(self::$backends);
foreach ($backendTypes as $type => $backend) {
if (isset($backend['dependsOn']) && $backend['dependsOn'] == 'file' && isset($backend['supportedFileExtensions']) && in_array($extension, $backend['supportedFileExtensions'])) {
$itemType = $type;
break;

Loading…
Cancel
Save