diff --git a/lib/upgrades/Ini.inc.php b/lib/upgrades/Ini.inc.php index b7c93b4..53c195d 100644 --- a/lib/upgrades/Ini.inc.php +++ b/lib/upgrades/Ini.inc.php @@ -68,7 +68,9 @@ class Ini { $date = date('YmdHis'); $backupFile = $iniFile . '.' .$date; - return file_put_contents($backupFile, $content) !== false; + if (is_writeable($backupFile)) { + file_put_contents($backupFile, $content); + } } function read($iniFile) { @@ -121,6 +123,10 @@ class Ini { if(empty($iniFile)) { $iniFile = $this->iniFile; } + if (!is_writeable($iniFile)) { + return; + } + $fileHandle = fopen($iniFile, 'wb'); foreach ($this->cleanArray as $section => $items) { if (substr($section, 0, strlen('_blankline_')) === '_blankline_' ) { diff --git a/plugins/search2/IndexingStatusDashlet.php b/plugins/search2/IndexingStatusDashlet.php index 527eaf2..47441fa 100644 --- a/plugins/search2/IndexingStatusDashlet.php +++ b/plugins/search2/IndexingStatusDashlet.php @@ -105,11 +105,14 @@ class IndexingStatusDashlet extends KTBaseDashlet $oTemplating =& KTTemplating::getSingleton(); $oTemplate = $oTemplating->loadTemplate('ktcore/search2/indexing_status'); + $url = KTUtil::kt_url(); + $aTemplateData = array( 'context' => $this, 'indexerName' => $this->indexerName, 'indexerDiagnosis' => $this->indexerDiagnosis, - 'extractorDiagnosis' => $this->extractorDiagnosis + 'extractorDiagnosis' => $this->extractorDiagnosis, + 'rootUrl' => $url ); return $oTemplate->render($aTemplateData); diff --git a/templates/ktcore/search2/indexing_status.smarty b/templates/ktcore/search2/indexing_status.smarty index 3043b29..8ea486c 100644 --- a/templates/ktcore/search2/indexing_status.smarty +++ b/templates/ktcore/search2/indexing_status.smarty @@ -36,5 +36,5 @@ {i18n}Note:{/i18n} {i18n}Indexing will not continue until all issues have been resolved.{/i18n} -
Refresh +Refresh
diff --git a/templates/ktcore/search2/lucene_statistics.smarty b/templates/ktcore/search2/lucene_statistics.smarty index e001fda..e0d7360 100644 --- a/templates/ktcore/search2/lucene_statistics.smarty +++ b/templates/ktcore/search2/lucene_statistics.smarty @@ -79,7 +79,7 @@ toggle.style.display = 'none'; {/if} - +
{i18n}Refresh{/i18n}
{i18n}Refresh{/i18n}