diff --git a/search/MySQLFulltextSearchable.php b/search/FulltextSearchable.php similarity index 82% rename from search/MySQLFulltextSearchable.php rename to search/FulltextSearchable.php index 2f7311c19..aba5ac0a2 100644 --- a/search/MySQLFulltextSearchable.php +++ b/search/FulltextSearchable.php @@ -3,7 +3,7 @@ /** * Provides a simple search engine for your site based on the MySQL FULLTEXT index */ -class MySQLFulltextSearchable extends DataObjectDecorator { +class FulltextSearchable extends DataObjectDecorator { protected $searchFields; /** @@ -18,9 +18,9 @@ class MySQLFulltextSearchable extends DataObjectDecorator { if(!is_array($searchableClasses)) $searchableClasses = array($searchableClasses); foreach($searchableClasses as $class) { if(isset($defaultColumns[$class])) { - Object::add_extension($class, "MySQLFulltextSearchable('{$defaultColumns[$class]}')"); + Object::add_extension($class, "FulltextSearchable('{$defaultColumns[$class]}')"); } else { - throw new Exception("MySQLFUlltextSearchable::enable() I don't know the default search columns for class '$class'"); + throw new Exception("FulltextSearchable::enable() I don't know the default search columns for class '$class'"); } } diff --git a/tests/search/SearchFormTest.php b/tests/search/SearchFormTest.php index 90b170d88..7b30e0944 100644 --- a/tests/search/SearchFormTest.php +++ b/tests/search/SearchFormTest.php @@ -14,10 +14,10 @@ class SearchFormTest extends FunctionalTest { protected $requiredExtensions = array( "SiteTree" => array( - "MySQLFulltextSearchable('Title,MenuTitle,Content,MetaTitle,MetaDescription,MetaKeywords')", + "FulltextSearchable('Title,MenuTitle,Content,MetaTitle,MetaDescription,MetaKeywords')", ), "File" => array( - "MySQLFulltextSearchable('Filename,Title,Content')", + "FulltextSearchable('Filename,Title,Content')", ), "ContentController" => array( "ContentControllerSearchExtension", diff --git a/tests/search/TranslatableSearchFormTest.php b/tests/search/TranslatableSearchFormTest.php index 8980e14ee..88375f914 100644 --- a/tests/search/TranslatableSearchFormTest.php +++ b/tests/search/TranslatableSearchFormTest.php @@ -12,10 +12,10 @@ class TranslatableSearchFormTest extends FunctionalTest { protected $requiredExtensions = array( 'SiteTree' => array( 'Translatable', - "MySQLFulltextSearchable('Title,MenuTitle,Content,MetaTitle,MetaDescription,MetaKeywords')", + "FulltextSearchable('Title,MenuTitle,Content,MetaTitle,MetaDescription,MetaKeywords')", ), "File" => array( - "MySQLFulltextSearchable('Filename,Title,Content')", + "FulltextSearchable('Filename,Title,Content')", ), "ContentController" => array( "ContentControllerSearchExtension",