[Solar-svn] Revision 2628

[pmjones at solarphp.com]

Branch: changed all 'datafilter' to 'filter'



Modified: branches/orm/Solar/Getopt.php
===================================================================
--- branches/orm/Solar/Getopt.php	2007-07-25 16:01:26 UTC (rev 2627)
+++ branches/orm/Solar/Getopt.php	2007-07-25 16:04:29 UTC (rev 2628)
@@ -45,7 +45,7 @@
      * : (dependency) A Solar_Request dependency injection.  Default is
      *   'request'.
      * 
-     * `datafilter_class`
+     * `filter_class`
      * : (string) The data-filter class to use when validating and sanitizing
      *   parameter values.  Default is 'Solar_Filter'.
      * 
@@ -60,7 +60,7 @@
      */
     protected $_Solar_Getopt = array(
         'request'          => 'request',
-        'datafilter_class' => 'Solar_Filter',
+        'filter_class' => 'Solar_Filter',
         'strict'           => true,
     );
     
@@ -186,7 +186,7 @@
         );
         
         // set up the data-filter class
-        $this->_filter = Solar::factory($this->_config['datafilter_class']);
+        $this->_filter = Solar::factory($this->_config['filter_class']);
     }
     
     // -----------------------------------------------------------------

Modified: branches/orm/Solar/Sql/Model/Catalog.php
===================================================================
--- branches/orm/Solar/Sql/Model/Catalog.php	2007-07-25 16:01:26 UTC (rev 2627)
+++ branches/orm/Solar/Sql/Model/Catalog.php	2007-07-25 16:04:29 UTC (rev 2628)
@@ -183,7 +183,7 @@
         $this->_fixModelName($model);
         $this->_fixPropertyCols($model);
         $this->_fixAccessMethods($model);
-        $this->_fixFilters($model); // including datafilter class
+        $this->_fixFilters($model); // including filter class
         $this->_fixRelated($model);
         
         // do we have a cache?
@@ -511,7 +511,7 @@
      */
     protected function _fixFilters($model)
     {
-        // make sure we have a datafilter class
+        // make sure we have a filter class
         if (empty($model->_filter_class)) {
             $class = $model->_stack->load('Filter', false);
             if (! $class) {