From 181e7855e3a4c80b8a0abb51b976bef5656d9979 Mon Sep 17 00:00:00 2001 From: Kevin Abel <kevin.abel.0@gmail.com> Date: Wed, 23 Apr 2014 10:06:49 -0500 Subject: [PATCH] Fix local template region population failing for certain sites. If the titlegraphic region is missing, it is more likely that the entire scanned page is missing proper regions. --- www/index.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/www/index.php b/www/index.php index 0e06dae..c9dcf2a 100644 --- a/www/index.php +++ b/www/index.php @@ -58,7 +58,7 @@ $page->addStyleSheet('css/search.css'); if (isset($_GET['u']) && $scanned = UNL_Search::getScannedPage($_GET['u'])) { // Add local site search results // we're scrapping the navigation and other content from the originatting site. - if (!$isEmbed && isset($scanned->navlinks)) { + if (!$isEmbed && isset($scanned->titlegraphic)) { require_once 'HTMLPurifier.auto.php'; $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.SerializerPath', '/tmp'); @@ -68,11 +68,7 @@ if (isset($_GET['u']) && $scanned = UNL_Search::getScannedPage($_GET['u'])) { $page->breadcrumbs = $purifier->purify(UNL_Search::removeRelativePaths($scanned->breadcrumbs, $_GET['u'])); $page->titlegraphic = $purifier->purify(str_replace(array('<h1>', '</h1>'), '',$scanned->titlegraphic)); $page->navlinks = $purifier->purify(UNL_Search::removeRelativePaths($scanned->navlinks, $_GET['u'])); - if (!empty($scanned->leftcollinks)) { - $page->leftcollinks = $purifier->purify($scanned->leftcollinks); - } if (!empty($scanned->contactinfo)) { - $page->contactinfo = $purifier->purify(preg_replace('#<h3>.*</h3>#', '', $scanned->contactinfo)); } if (!empty($scanned->footercontent)) { -- GitLab