projects
/
mkdru-moved-to-drupal.org.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6446b0c
)
Remove debug output and fix variable_get() call
author
Jason Skomorowski
<jason@indexdata.com>
Tue, 22 Mar 2011 05:49:04 +0000
(
05:49
+0000)
committer
Jason Skomorowski
<jason@indexdata.com>
Tue, 22 Mar 2011 05:49:04 +0000
(
05:49
+0000)
mkdru.module
patch
|
blob
|
history
diff --git
a/mkdru.module
b/mkdru.module
index
fd6a4cd
..
24e36c2
100644
(file)
--- a/
mkdru.module
+++ b/
mkdru.module
@@
-30,7
+30,7
@@
function mkdru_ting_search_tab($keys) {
$html = theme('mkdru_results');
drupal_add_js(array('mkdru' =>
array(
$html = theme('mkdru_results');
drupal_add_js(array('mkdru' =>
array(
- 'settings' => variable_get('mkdru_ding'),
+ 'settings' => json_encode(variable_get('mkdru_ding', NULL)),
'pz2_path' => variable_get('pz2_path', '/pazpar2/search.pz2'),
'query' => $keys
)
'pz2_path' => variable_get('pz2_path', '/pazpar2/search.pz2'),
'query' => $keys
)
@@
-105,7
+105,6
@@
function mkdru_init() {
// Config form common to node and settings
// function mkdru_settings_form($form, &$form_state) {
function mkdru_settings_form(&$form_state) {
// Config form common to node and settings
// function mkdru_settings_form($form, &$form_state) {
function mkdru_settings_form(&$form_state) {
-// dpm($form_state);
if (isset($form_state['values']['settings'])) {
$settings = $form_state['build_info']['args']['settings'];
}
if (isset($form_state['values']['settings'])) {
$settings = $form_state['build_info']['args']['settings'];
}
@@
-247,7
+246,6
@@
function mkdru_ding_settings(&$form_state) {
return $form;
}
function mkdru_ding_settings_submit($form, &$form_state) {
return $form;
}
function mkdru_ding_settings_submit($form, &$form_state) {
- dpm($form_state);
variable_set('mkdru_ding', $form_state[values][settings]);
drupal_set_message(t('The configuration options have been saved.'));
}
variable_set('mkdru_ding', $form_state[values][settings]);
drupal_set_message(t('The configuration options have been saved.'));
}