diff --git a/contentanalysis.js b/contentanalysis.js
index 6bd3055..6ff31b6 100644
--- a/contentanalysis.js
+++ b/contentanalysis.js
@@ -4,7 +4,7 @@
* JS for content analysis.
*/
- var contentanalysis = contentanalysis || {};
+ var contentanalysis = Drupal.settings.contentanalysis = contentanalysis || {};
(function ($, $$) {
$.extend($$, {
diff --git a/contentanalysis.module b/contentanalysis.module
index 621d229..e529bf1 100644
--- a/contentanalysis.module
+++ b/contentanalysis.module
@@ -301,7 +301,7 @@ function contentanalysis_analysis_form($form_state, $analysis = array(), $node =
'attributes' => array(
'id' => 'contentanalysis-ininline-analysis-button',
'class' => 'contentanalysis-analyze-content contentanalysis-button',
- 'onclick' => 'contentanalysis_inline_analysis(); return (false);',
+ 'onclick' => 'contentanalysis.contentanalysis_inline_analysis(); return (false);',
),
)) . '',
);
@@ -313,7 +313,7 @@ function contentanalysis_analysis_form($form_state, $analysis = array(), $node =
$v .= ' ';
$v .= ctools_ajax_text_button(t('Main report'), 'contentanalysis/ajax/analysis_only', t('Content Analysis'), 'contentanalysis-button', 'ctools-use-modal');
$v .= ' ';
- $v .= '' . t('Inline reports') . '';
+ $v .= '' . t('Inline reports') . '';
$v .= '';
$form['clickme'] = array(
'#type' => 'markup',
@@ -527,7 +527,7 @@ function contentanalysis_save_status($analysis) {
if (substr($anid, 0, 1) == '#' || !is_array($analysis_item)) {
continue;
}
- if ((isset($analysis_item['#status']) && ($analysis_item['#status'] != 'status')) || isset($analysis_item['#score'])) {
+ if ((isset($analysis_item['#status']) && ($analysis_item['#status'] != 'status')) || $analysis_item['#score']) {
$status = array(
'error' => 0,
'warning' => 1,
@@ -917,7 +917,20 @@ function contentanalysis_parse_context_metatags($context) {
$nodemeta = metatag_metatags_view('node:' . $context['node']->type, $metatags, $options);
$globalmeta = metatag_metatags_view('global', array(), $options);
- if (isset($nodemeta['title']['#attached']['metatag_set_preprocess_variable'][0][2])) {
+ // init data for toke_replace
+ $types = array();
+ if (isset($context['node'])) {
+ $types['node'] = $context['node'];
+ }
+ if (!empty($context['inputs']['meta_title'])) {
+ $types['meta_title'] = NULL;
+ $context['meta_title'] = token_replace($context['inputs']['meta_title'], $types);
+ }
+ elseif (!empty($context['node']->metatags[$context['node']->language]['title']['value'])) {
+ $types['meta_title'] = NULL;
+ $context['meta_title'] = token_replace($context['node']->metatags[$context['node']->language]['title']['value'], $types);
+ }
+ elseif (isset($nodemeta['title']['#attached']['metatag_set_preprocess_variable'][0][2])) {
$context['meta_title'] = $nodemeta['title']['#attached']['metatag_set_preprocess_variable'][0][2];
}
if (isset($nodemeta['keywords']['#attached']['drupal_add_html_head'][0][0]['#value'])) {
@@ -1541,6 +1554,7 @@ function contentanalysis_form_alter(&$form, &$form_state, $form_id) {
'#collapsible' => TRUE,
'#collapsed' => variable_get('contentanalysis_node_edit_form_collapsed', 0),
'#group' => 'additional_settings',
+ '#weight' => -99,
);
$form['contentanalysis'] = array_merge($form['contentanalysis'], contentanalysis_analysis_form($form_state, array(), $node, 'node-edit'));
@@ -1671,7 +1685,7 @@ function contentanalysis_get_aid($context, $save = 0) {
$where = TRUE;
}
// By pass db save if analyzing content direct submission.
- if (isset($where) && isset($save)) {
+ if (isset($where, $save) && $where && $save) {
$result = $query->execute()->fetchObject();
$fields = array(
'last_analysis' => REQUEST_TIME,