tonyair
/
silverstripe-fulltextsearch
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3.9' into 3

This commit is contained in:
Steve Boyd 2022-02-01 14:03:34 +13:00
parent f0e781da36 e0ec87a0ed
commit 5282cdc3ed
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -26,7 +26,8 @@
"monolog/monolog": "~1.15",
"ptcinc/solr-php-client": "^1.0",
"symfony/process": "^3.2 || ^4",
"tractorcow/silverstripe-proxy-db": "~0.1"
"tractorcow/silverstripe-proxy-db": "~0.1",
"ext-curl": "*"
},
"require-dev": {
"silverstripe/cms": "^4.0",

4
src/Search/Services/SearchableService.php
View File

@ -151,12 +151,12 @@ class SearchableService
// Anonymous member canView() for indexing
if (!$this->classSkipsCanViewCheck($objClass)) {
$value = Member::actAs(null, function () use ($obj) {
return $obj->canView();
return (bool) $obj->canView();
});
}
} else {
// Current member canView() check for retrieving search results
$value = $obj->canView();
$value = (bool) $obj->canView();
}
}
$this->extend('updateIsSearchable', $obj, $indexing, $value);

19
src/Utils/WebDAV.php
View File

@ -22,10 +22,14 @@ class WebDAV
}
$ch = self::curl_init($url, 'PROPFIND');
$res = curl_exec($ch);
curl_exec($ch);
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$err = curl_error($ch);
curl_close($ch);
if ($code == 404) {
return false;
}
@ -33,8 +37,6 @@ class WebDAV
return true;
}
$err = curl_error($ch);
user_error("Got error from webdav server - " . $err, E_USER_ERROR);
}
@ -42,8 +44,9 @@ class WebDAV
{
$ch = self::curl_init(rtrim($url, '/') . '/', 'MKCOL');
$res = curl_exec($ch);
curl_exec($ch);
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
return $code == 201;
}
@ -58,10 +61,12 @@ class WebDAV
curl_setopt($ch, CURLOPT_INFILE, $handle);
$res = curl_exec($ch);
curl_exec($ch);
fclose($handle);
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
return curl_getinfo($ch, CURLINFO_HTTP_CODE);
return $code;
}
public static function upload_from_string($string, $url)