root

Changeset 530

Show
Ignore:
Timestamp:
03/18/09 12:57:47 (1 year ago)
Author:
wbond
Message:

Fixed a bug in fCRUD::redirectWithLoadedValues() preventing loaded search values from being included in redirects

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • fCRUD.php

    r448 r530 Hide Line Numbers
    33 * Provides miscellaneous functionality for [http://en.wikipedia.org/wiki/Create,_read,_update_and_delete CRUD-like] pages 
    44 *  
    5  * @copyright  Copyright (c) 2007-2008 Will Bond 
     5 * @copyright  Copyright (c) 2007-2009 Will Bond 
    66 * @author     Will Bond [wb] <will@flourishlib.com> 
    77 * @license    http://flourishlib.com/license 
    …… 
    1010 * @link       http://flourishlib.com/fCRUD 
    1111 *  
    12  * @version    1.0.0b 
    13  * @changes    1.0.0b  The initial implementation [wb, 2007-06-14] 
     12 * @version    1.0.0b2 
     13 * @changes    1.0.0b2  Fixed a bug preventing loaded search values from being included in redirects [wb, 2009-03-18] 
     14 * @changes    1.0.0b   The initial implementation [wb, 2007-06-14] 
    1415 */ 
    1516class fCRUD 
    …… 
    201202        } 
    202203         
    203         if (self::getPreviousSearchValue($column) && fRequest::get($column, $cast_to, $default) === NULL) { 
     204        if (self::getPreviousSearchValue($column) && !fRequest::check($column)) { 
    204205            self::$search_values[$column] = self::getPreviousSearchValue($column); 
    205206            self::$loaded_values[$column] = self::$search_values[$column]; 
    …… 
    233234        } 
    234235         
    235         if (self::getPreviousSortColumn() && fRequest::get('sort') === NULL) { 
     236        if (self::getPreviousSortColumn() && !fRequest::check('sort')) { 
    236237            self::$sort_column = self::getPreviousSortColumn(); 
    237238            self::$loaded_values['sort'] = self::$sort_column; 
    …… 
    258259        } 
    259260         
    260         if (self::getPreviousSortDirection() && fRequest::get('dir') === NULL) { 
     261        if (self::getPreviousSortDirection() && !fRequest::check('dir')) { 
    261262            self::$sort_direction = self::getPreviousSortDirection(); 
    262263            self::$loaded_values['dir'] = self::$sort_direction; 
    …… 
    580581 
    581582/** 
    582  * Copyright (c) 2007-2008 Will Bond <will@flourishlib.com> 
     583 * Copyright (c) 2007-2009 Will Bond <will@flourishlib.com> 
    583584 *  
    584585 * Permission is hereby granted, free of charge, to any person obtaining a copy