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.

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

Fixes for issues #174 and #175 and drupal.org issue #2075227 #176

Open
wants to merge 4 commits into
base: 7.x-1.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion biblio.info
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ files[] = views/biblio_handler_sort_contributor_lastname.inc
files[] = views/biblio_handler_argument_many_to_one.inc
files[] = views/biblio_handler_field_export_link.inc
; Information added by drupal.org packaging script on 2013-05-31
version = "7.x-1.0-rc5+37-dev"
version = "7.x-1.0-rc7"
core = "7.x"
project = "biblio"
datestamp = "1370023530"
Expand Down
4 changes: 2 additions & 2 deletions biblio.module
Original file line number Diff line number Diff line change
Expand Up @@ -1896,7 +1896,7 @@ function _biblio_citekey_print($citekey) {
$style = biblio_get_style();
$base = variable_get('biblio_base', 'biblio');
$node = node_load($nid->nid);
return theme('biblio_style', array('node' => $node, 'base' => $base, 'style' => $style));
return theme('biblio_style', array('node' => $node, 'base' => $base, 'style_name' => $style));
}
else {
return t("Citekey @cite not found", array('@cite' => $citekey));
Expand Down Expand Up @@ -2254,4 +2254,4 @@ function biblio_ctools_plugin_api() {
if ($module == "feeds" && $api == "feeds_importer_default") {
return array("version" => 1);
}
}
}
6 changes: 5 additions & 1 deletion modules/CiteProc/biblio_citeproc.admin.inc
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,18 @@ function _install_csl($name = NULL, $csl = NULL, $sha = NULL, $all = FALSE, $upd
}
}
else {
drupal_set_message(t('I could not parse the CSL provided as valid XML', 'error'));
drupal_set_message(t('I could not parse the CSL provided as valid XML'), 'error');
}
}

function _get_zip_from_github() {
$zip_url = 'https://github.com/citation-style-language/styles/zipball/master';
$destination = file_build_uri('Biblio-CiteProc-Styles.zip');
$zip_file = system_retrieve_file($zip_url, $destination, TRUE, FILE_EXISTS_REPLACE);
if ($zip_file === FALSE){
drupal_set_message(t('Failed to fetch zipfile at @zipfile',array('@zipfile' => $zip_url)), 'error');
return;
}
$usage = file_usage_list($zip_file);
if (empty($usage)) {
file_usage_add($zip_file, 'biblio_citeproc', 'csl', 0);
Expand Down
4 changes: 2 additions & 2 deletions modules/crossref/biblio.crossref.client.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function getQuery() {
public function fetch() {
$this->query = $this->url . '?pid=' . $this->pid . '&noredirect=true&format=unixref&id=doi%3A' . $this->doi;

$request_options = array('method' => 'POST');
$request_options = array('method' => 'GET');
$result = drupal_http_request($this->query, $request_options);

if ($result->code != 200) {
Expand Down Expand Up @@ -323,4 +323,4 @@ function _unixref_get_contributor_category($role) {
if ($role == 'translator') return 4;
return NULL;
}
}
}