Merge branch '1.0' into 1.1

.travis.yml

@@ -0,0 +1,20 @@
+# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
+
+language: php
+
+dist: precise
+
+php: 
+ - 5.3
+
+env:
+ - DB=MYSQL CORE_RELEASE=3.0
+ - DB=PGSQL CORE_RELEASE=3.0
+
+before_script:
+ - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
+ - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
+ - cd ~/builds/ss
+
+script: 
+ - phpunit googlesitemaps/tests/

README.md

@@ -1,5 +1,7 @@
 # Google Sitemaps Module
 
+[![Build Status](https://secure.travis-ci.org/wilr/silverstripe-googlesitemaps.png?branch=1.1)](http://travis-ci.org/wilr/silverstripe-googlesitemaps)
+
 ## Maintainer Contact
 
 * Will Rossiter (Nickname: wrossiter, willr) <will@fullscreen.io>

tests/GoogleSitemapTest.php

@@ -95,7 +95,7 @@ class GoogleSitemapTest extends FunctionalTest {
 		GoogleSitemap::register_dataobject("GoogleSitemapTest_DataObject");
 
 		DB::query("
-			UPDATE GoogleSitemapTest_DataObject SET LastEdited = '2012-01-14'"
+			UPDATE \"GoogleSitemapTest_DataObject\" SET \"LastEdited\" = '2012-01-14'"
 		);
 
 		$response = $this->get('sitemap.xml');