Merge remote-tracking branch 'upstream'
Pull latest upstream changes
This commit is contained in:
+4
-4
@@ -236,7 +236,7 @@ if (defined('ENCODING')) {
|
||||
@define('BIBTEXBROWSER_URL',basename(__FILE__));
|
||||
|
||||
// Specify the location of the cache file for servers that need temporary files written in a specific location
|
||||
@define('CACHE_DIR','');
|
||||
@define('CACHE_DIR','.');
|
||||
|
||||
// Specify the location of the bib file for servers that need do not allow slashes in URLs,
|
||||
// where the bib file and bibtexbrowser.php are in different directories.
|
||||
@@ -368,7 +368,7 @@ function _zetDB($bibtex_filenames) {
|
||||
// ---------------------------- HANDLING caching of compiled bibtex files
|
||||
// for sake of performance, once the bibtex file is parsed
|
||||
// we try to save a "compiled" in a txt file
|
||||
$compiledbib = CACHE_DIR.'bibtexbrowser_'.md5($bibtex_filenames).'.dat';
|
||||
$compiledbib = c("CACHE_DIR").'/bibtexbrowser_'.md5($bibtex_filenames).'.dat';
|
||||
|
||||
$parse=filemtime(__FILE__)>@filemtime($compiledbib);
|
||||
|
||||
@@ -3481,7 +3481,7 @@ class AcademicDisplay {
|
||||
$this->db = createBibDataBase();
|
||||
$this->db->bibdb = $this->entries;
|
||||
|
||||
if (BIBTEXBROWSER_ACADEMIC_TOC != true) {
|
||||
if (c("BIBTEXBROWSER_ACADEMIC_TOC") == false) {
|
||||
foreach (_DefaultBibliographySections() as $section) {
|
||||
$this->search2html($section['query'],$section['title']);
|
||||
}
|
||||
@@ -3515,7 +3515,7 @@ class AcademicDisplay {
|
||||
echo "\n<a name=\"".$section['anchor']."\"></a>";
|
||||
echo "<h".BIBTEXBROWSER_HTMLHEADINGLEVEL.">";
|
||||
echo $section['title']." (".$section['count'].")";
|
||||
echo "</h".BIBTEXBROWSER_HTMLHEADINGLEVEL.">\n",
|
||||
echo "</h".BIBTEXBROWSER_HTMLHEADINGLEVEL.">\n";
|
||||
$section['display']->display();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user