2 commits - kolab.org/www
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Wed Mar 14 18:01:46 CET 2012
kolab.org/www/drupal-6.24/sites/all/modules/data/data.info | 6 -
kolab.org/www/drupal-6.24/sites/all/modules/data/data.views.inc | 4
kolab.org/www/drupal-6.24/sites/all/modules/data/data_node/data_node.info | 6 -
kolab.org/www/drupal-6.24/sites/all/modules/data/data_search/data_search.info | 6 -
kolab.org/www/drupal-6.24/sites/all/modules/data/data_taxonomy/data_taxonomy.info | 6 -
kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.admin.inc | 15 +-
kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.info | 6 -
kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.module | 57 ++++------
kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.views_default.inc | 1
kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/tests/data_ui_test.info | 6 -
kolab.org/www/drupal-6.24/sites/all/modules/data/data_vbo/data_vbo.info | 6 -
11 files changed, 60 insertions(+), 59 deletions(-)
New commits:
commit 8ab21bba4051c4088dbdf6054f57e8227c0a50f2
Merge: 1026b49 d79ea91
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Wed Mar 14 17:01:41 2012 +0000
Merge branch 'master' of ssh://git.kolabsys.com/git/kolab.org-www
commit 1026b49b7bb65fb0d4925c47e1a98b3afc41d109
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Wed Mar 14 17:01:16 2012 +0000
Update module data
diff --git a/kolab.org/www/drupal-6.24/sites/all/modules/data/data.info b/kolab.org/www/drupal-6.24/sites/all/modules/data/data.info
index a36dbeb..0582488 100644
--- a/kolab.org/www/drupal-6.24/sites/all/modules/data/data.info
+++ b/kolab.org/www/drupal-6.24/sites/all/modules/data/data.info
@@ -3,9 +3,9 @@ description = Provides two dimensional storage space for arbitrary data sets.
package = Data
dependencies[] = ctools
core = 6.x
-; Information added by drupal.org packaging script on 2012-01-06
-version = "6.x-1.0"
+; Information added by drupal.org packaging script on 2012-03-06
+version = "6.x-1.1"
core = "6.x"
project = "data"
-datestamp = "1325846138"
+datestamp = "1331073948"
diff --git a/kolab.org/www/drupal-6.24/sites/all/modules/data/data.views.inc b/kolab.org/www/drupal-6.24/sites/all/modules/data/data.views.inc
index 123be1e..9679759 100644
--- a/kolab.org/www/drupal-6.24/sites/all/modules/data/data.views.inc
+++ b/kolab.org/www/drupal-6.24/sites/all/modules/data/data.views.inc
@@ -25,7 +25,7 @@ function data_views_data() {
$table_data = array();
$table_data['table'] = array(
- 'group' => $table->get('title'),
+ 'group' => check_plain($table->get('title')),
);
foreach ($schema['fields'] as $field_name => $field) {
// If there is no label, generate one from field name.
@@ -59,7 +59,7 @@ function data_views_data() {
if (isset($schema['primary key']) && count($schema['primary key']) >= 1) {
$table_data['table']['base'] = array(
'field' => current($schema['primary key']),
- 'title' => $table->get('title'),
+ 'title' => check_plain($table->get('title')),
'help' => t('Data table'),
'weight' => 10,
);
diff --git a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_node/data_node.info b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_node/data_node.info
index 150b8c9..3d44ab1 100644
--- a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_node/data_node.info
+++ b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_node/data_node.info
@@ -4,9 +4,9 @@ package = Data
dependencies[] = data
dependencies[] = data_ui
core = 6.x
-; Information added by drupal.org packaging script on 2012-01-06
-version = "6.x-1.0"
+; Information added by drupal.org packaging script on 2012-03-06
+version = "6.x-1.1"
core = "6.x"
project = "data"
-datestamp = "1325846138"
+datestamp = "1331073948"
diff --git a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_search/data_search.info b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_search/data_search.info
index 4f177dc..977c257 100644
--- a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_search/data_search.info
+++ b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_search/data_search.info
@@ -4,9 +4,9 @@ package = Data
dependencies[] = data
dependencies[] = search
core = 6.x
-; Information added by drupal.org packaging script on 2012-01-06
-version = "6.x-1.0"
+; Information added by drupal.org packaging script on 2012-03-06
+version = "6.x-1.1"
core = "6.x"
project = "data"
-datestamp = "1325846138"
+datestamp = "1331073948"
diff --git a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_taxonomy/data_taxonomy.info b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_taxonomy/data_taxonomy.info
index 5acc1f7..08a8067 100644
--- a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_taxonomy/data_taxonomy.info
+++ b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_taxonomy/data_taxonomy.info
@@ -6,9 +6,9 @@ dependencies[] = data_ui
dependencies[] = taxonomy
core = 6.x
-; Information added by drupal.org packaging script on 2012-01-06
-version = "6.x-1.0"
+; Information added by drupal.org packaging script on 2012-03-06
+version = "6.x-1.1"
core = "6.x"
project = "data"
-datestamp = "1325846138"
+datestamp = "1331073948"
diff --git a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.admin.inc b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.admin.inc
index b86a90c..a0b1fe6 100644
--- a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.admin.inc
+++ b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.admin.inc
@@ -12,7 +12,7 @@ function data_ui_view() {
$rows = array();
foreach ($tables as $table) {
$row = array(
- $table->get('title'),
+ check_plain($table->get('title')),
$table->get('name'),
db_result(db_query('SELECT COUNT(*) FROM {'. db_escape_table($table->get('name')) .'}')),
);
@@ -555,10 +555,12 @@ function data_ui_edit_form_submit($form, &$form_state) {
$schema = $table->get('table_schema');
if (!db_table_exists($table->get('name'))) {
- drupal_set_message(t('Table does not exist in database.'), 'error');
- if (module_exists('schema')) {
- drupal_set_message(t('Go to !compare to resolve conflicts.', array('!compare' => l(t('Compare schemas'), 'admin/build/data/compare'))), 'error');
- }
+ drupal_set_message(
+ t('Table does not exist in database.') . ' ' .
+ t('Go to !compare to resolve conflicts.', array(
+ '!compare' => l(t('Compare schemas'), 'admin/build/data/compare')
+ )),
+ 'error');
return;
}
@@ -653,7 +655,8 @@ function data_ui_edit_title_form(&$form_state, $table) {
'#type' => 'textfield',
'#title' => t('Title'),
'#description' => t('Natural name of the table.'),
- '#default_value' => db_escape_table($table->get('title')),
+ // Do not escape the title: show the user what they originally entered.
+ '#default_value' => $table->get('title'),
);
$form['submit'] = array(
'#type' => 'submit',
diff --git a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.info b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.info
index bd19bca..5511eb3 100644
--- a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.info
+++ b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.info
@@ -4,9 +4,9 @@ package = Data
dependencies[] = data
dependencies[] = schema
core = 6.x
-; Information added by drupal.org packaging script on 2012-01-06
-version = "6.x-1.0"
+; Information added by drupal.org packaging script on 2012-03-06
+version = "6.x-1.1"
core = "6.x"
project = "data"
-datestamp = "1325846138"
+datestamp = "1331073948"
diff --git a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.module b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.module
index a0a7b42..451b3c5 100644
--- a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.module
+++ b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.module
@@ -52,36 +52,33 @@ function data_ui_menu() {
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -10,
);
- // Only offer these options if schema module exists.
- if (module_exists('schema')) {
- $items['admin/build/data/compare'] = array(
- 'title' => 'Compare schemas',
- 'description' => 'Administer data tables.',
- 'page callback' => 'data_ui_compare',
- 'file' => 'data_ui.admin.inc',
- 'access arguments' => array('administer data tables'),
- 'type' => MENU_LOCAL_TASK,
- );
- $items['admin/build/data/compare/%data_ui_table'] = array(
- 'title' => 'Adjust schema',
- 'description' => 'Administer data tables.',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('data_ui_adjust_form', 4),
- 'file' => 'data_ui.admin.inc',
- 'access arguments' => array('administer data tables'),
- 'type' => MENU_LOCAL_TASK,
- );
- $items['admin/build/data/adopt'] = array(
- 'title' => 'Adopt tables',
- 'description' => 'Adopt data tables that aren\'t claimed by any module.',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('data_ui_adopt_form'),
- 'file' => 'data_ui.admin.inc',
- 'access arguments' => array('administer data tables'),
- 'type' => MENU_LOCAL_TASK,
- 'weight' => 10,
- );
- }
+ $items['admin/build/data/compare'] = array(
+ 'title' => 'Compare schemas',
+ 'description' => 'Administer data tables.',
+ 'page callback' => 'data_ui_compare',
+ 'file' => 'data_ui.admin.inc',
+ 'access arguments' => array('administer data tables'),
+ 'type' => MENU_LOCAL_TASK,
+ );
+ $items['admin/build/data/compare/%data_ui_table'] = array(
+ 'title' => 'Adjust schema',
+ 'description' => 'Administer data tables.',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('data_ui_adjust_form', 4),
+ 'file' => 'data_ui.admin.inc',
+ 'access arguments' => array('administer data tables'),
+ 'type' => MENU_LOCAL_TASK,
+ );
+ $items['admin/build/data/adopt'] = array(
+ 'title' => 'Adopt tables',
+ 'description' => 'Adopt data tables that aren\'t claimed by any module.',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('data_ui_adopt_form'),
+ 'file' => 'data_ui.admin.inc',
+ 'access arguments' => array('administer data tables'),
+ 'type' => MENU_LOCAL_TASK,
+ 'weight' => 10,
+ );
$items['admin/build/data/create'] = array(
'title' => 'Create a table',
'description' => 'Create a data table.',
diff --git a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.views_default.inc b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.views_default.inc
index 11cf811..e550c57 100644
--- a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.views_default.inc
+++ b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/data_ui.views_default.inc
@@ -68,6 +68,7 @@ function data_ui_views_default_views() {
'style_options' => array(),
'wildcard' => 'all',
'wildcard_substitution' => 'All',
+ // These correspond to user-entered data and so should not be escaped.
'title' => $table->get('title') .' %1',
'id' => $first,
'table' => $table->get('name'),
diff --git a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/tests/data_ui_test.info b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/tests/data_ui_test.info
index 2756e32..8f746ae 100644
--- a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/tests/data_ui_test.info
+++ b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_ui/tests/data_ui_test.info
@@ -4,9 +4,9 @@ package = Testing
version = VERSION
core = 6.x
hidden = TRUE
-; Information added by drupal.org packaging script on 2012-01-06
-version = "6.x-1.0"
+; Information added by drupal.org packaging script on 2012-03-06
+version = "6.x-1.1"
core = "6.x"
project = "data"
-datestamp = "1325846138"
+datestamp = "1331073948"
diff --git a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_vbo/data_vbo.info b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_vbo/data_vbo.info
index f1c8b7b..e7a925f 100644
--- a/kolab.org/www/drupal-6.24/sites/all/modules/data/data_vbo/data_vbo.info
+++ b/kolab.org/www/drupal-6.24/sites/all/modules/data/data_vbo/data_vbo.info
@@ -5,9 +5,9 @@ dependencies[] = data
dependencies[] = views_bulk_operations
core = 6.x
-; Information added by drupal.org packaging script on 2012-01-06
-version = "6.x-1.0"
+; Information added by drupal.org packaging script on 2012-03-06
+version = "6.x-1.1"
core = "6.x"
project = "data"
-datestamp = "1325846138"
+datestamp = "1331073948"
More information about the commits
mailing list