aboutsummaryrefslogtreecommitdiffstats
path: root/core/include/search
diff options
context:
space:
mode:
authorThomas Lange <code@nerdmind.de>2018-04-01 17:06:20 +0200
committerThomas Lange <code@nerdmind.de>2018-04-01 17:06:20 +0200
commit36965226acd25178ce3d28633aadc1749f85b9f2 (patch)
tree55fccdaf919b18809f9143eac051185fe977cfc3 /core/include/search
parent2a017afea40941f6cc18208a6f595ee129ae143c (diff)
downloadblog-36965226acd25178ce3d28633aadc1749f85b9f2.tar.gz
blog-36965226acd25178ce3d28633aadc1749f85b9f2.tar.xz
blog-36965226acd25178ce3d28633aadc1749f85b9f2.zip
Replace method calls "getSearchResultIDs" with "getSearchResults"
This commit replaces the method calls of "Item::getSearchResultIDs" with "Item::getSearchResults". In addition, the associated Item instances (Page or Post) are therefore now created with "Factory::buildByAttribute" instead of "Factory::build" (because "getSearchResults" returns an array of Attribute instances while "getSearchResultIDs" had returned an array of unique item IDs without attribute data).
Diffstat (limited to 'core/include/search')
-rw-r--r--core/include/search/main.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/include/search/main.php b/core/include/search/main.php
index 8854b79..5a9708e 100644
--- a/core/include/search/main.php
+++ b/core/include/search/main.php
@@ -11,7 +11,7 @@ $M_LIST = $Database->query(sprintf('SELECT DISTINCT MONTH(time_insert) AS temp F
$Y_LIST = $Database->query(sprintf('SELECT DISTINCT YEAR(time_insert) AS temp FROM %s ORDER BY temp', Post\Attribute::TABLE));
if($search = HTTP::GET('q')) {
- if(!$postIDs = Post\Item::getSearchResultIDs($search, [HTTP::GET('d'), HTTP::GET('m'), HTTP::GET('y')], $Database)) {
+ if(!$attributes = Post\Item::getSearchResults($search, [HTTP::GET('d'), HTTP::GET('m'), HTTP::GET('y')], $Database)) {
$message = $Language->text('search_no_results', escapeHTML($search));
}
}
@@ -38,10 +38,10 @@ $search_data = [
# TRY: Template\Exception
#===============================================================================
try {
- if(isset($postIDs) AND !empty($postIDs)) {
- foreach($postIDs as $postID) {
+ if(isset($attributes) AND !empty($attributes)) {
+ foreach($attributes as $Attribute) {
try {
- $Post = Post\Factory::build($postID);
+ $Post = Post\Factory::buildByAttribute($Attribute);
$User = User\Factory::build($Post->attr('user'));
$posts[] = generatePostItemTemplate($Post, $User);