Merge branch '3.6'

cultuurnet · Jul 10, 2015 · 43bdda8 · 43bdda8
2 parents 87c9299 + 3cc3c58
commit 43bdda8
Show file tree

Hide file tree

Showing 147 changed files with 8,353 additions and 2,330 deletions.
diff --git a/composer.json b/composer.json
@@ -4,9 +4,11 @@
     "description": "CultuurNet culturefeed Drupal module",
     "license": "Apache-2.0",
     "require": {
-      "cultuurnet/search": "~1.0",
-      "cultuurnet/cdb": "~2.0",
-      "cultuurnet/culturefeed-php": "~1.0"
+      "cultuurnet/search": "~1.2",
+      "cultuurnet/cdb": "~2.1",
+      "cultuurnet/culturefeed-php": "~1.5",
+      "cultuurnet/calendar-summary": "~1.0",
+      "cultuurnet/sitemap-xml": "~1.0"
     },
     "require-dev": {
       "phing/phing": "~2.10"

diff --git a/composer.lock b/composer.lock
diff --git a/culturefeed.admin.inc b/culturefeed.admin.inc
@@ -41,6 +41,15 @@ function culturefeed_admin_settings() {
     '#default_value' => variable_get('culturefeed_entry_api_path', CULTUREFEED_ENTRY_API_PATH),
   );
 
+  $cdb_xml_versions = culturefeed_cdb_xml_versions();
+  $form['culturefeed_cdb_version'] = array(
+    '#default_value' => variable_get('culturefeed_cdb_version', CULTUREFEED_CDB_DEFAULT_VERSION),
+    '#description' => t('The culturefeed cdb schema version used by the entry API.'),
+    '#title' => t('Cdb schema version'),
+    '#type' => 'select',
+    '#options' => array_combine($cdb_xml_versions, $cdb_xml_versions),
+  );
+
   $form['culturefeed_http_client_timeout'] = array(
     '#type' => 'textfield',
     '#title' => t('HTTP client timeout'),