Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Be more generous with URL expansion #755

Merged
merged 13 commits into from
Sep 19, 2018
Merged

Be more generous with URL expansion #755

Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
aba6d58
Be more generous with URL expansion
GlazerMann Sep 11, 2018
cde5026
Update Template.php
GlazerMann Sep 11, 2018
cee15e9
deal with non-journal urls
GlazerMann Sep 11, 2018
4d44a2b
Update Template.php
GlazerMann Sep 11, 2018
fab14ff
Update Template.php
GlazerMann Sep 11, 2018
489309e
Better url conversation
GlazerMann Sep 13, 2018
46d5d04
Better handling of bare references
GlazerMann Sep 13, 2018
069d4fe
Use blank() array option
GlazerMann Sep 18, 2018
e7d8019
Update Template.php
GlazerMann Sep 18, 2018
2bcf2d0
Check DOI is NOT active before marking inactive
Sep 19, 2018
e35f216
use template's doi
Sep 19, 2018
725bb00
blank does not support elements being arrays
GlazerMann Sep 19, 2018
e5cac58
remove uneeded code
GlazerMann Sep 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ public function parse_text($text) {
// Re-assemble parsed template into string
public function parsed_text() {
if ($this->has(strtolower('CITATION_BOT_PLACEHOLDER_BARE_URL'))) {
if ($this->blank('title')) {
if ($this->has('doi') && !doi_active($this->get('doi')) && $this->blank([DOI_BROKEN_ALIASES, 'title', 'chapter'])) {
$this->mark_inactive_doi(); // Check it right now-this routine is called from within TEMPLATE()
}
if ($this->blank(['title', 'chapter'])) {
return base64_decode($this->get(strtolower('CITATION_BOT_PLACEHOLDER_BARE_URL')));
} else {
$this->forget(strtolower('CITATION_BOT_PLACEHOLDER_BARE_URL'));
Expand Down