- Timestamp:
- 09/26/08 09:23:38 (2 years ago)
- Files:
-
- fActiveRecord.php (modified) (2 diffs)
- fDatabase.php (modified) (1 diff)
- fDate.php (modified) (1 diff)
- fNumber.php (modified) (1 diff)
- fORM.php (modified) (2 diffs)
- fORMDatabase.php (modified) (1 diff)
- fORMJSON.php (modified) (1 diff)
- fTime.php (modified) (1 diff)
- fTimestamp.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
fActiveRecord.php
r218 r242 Hide Line Numbers 623 623 if (is_object($value) && is_callable(array($value, '__toString'))) { 624 624 $value = $value->__toString(); 625 } 626 627 // If we are left with an object at this point then we don't know what to do with it 628 if (is_object($value)) { 629 fCore::toss( 630 'fProgrammerException', 631 fGrammar::compose( 632 'The column specified, %s, contains an object that does not have a __toString() method - unsure how to get object value', 633 fCore::dump($column) 634 ) 635 ); 625 } elseif (is_object($value)) { 626 $value = (string) $value; 636 627 } 637 628 … … 1003 994 // Other objects 1004 995 if (is_object($value) && is_callable(array($value, '__toString'))) { 1005 return fHTML::prepare($value->__toString()); 1006 } 1007 1008 // If we are left with an object at this point then we don't know what to do with it 1009 if (is_object($value)) { 1010 fCore::toss( 1011 'fProgrammerException', 1012 fGrammar::compose( 1013 'The column specified, %s, contains an object that does not have a __toString() method - unsure how to get object value', 1014 fCore::dump($column) 1015 ) 1016 ); 996 $value = $value->__toString(); 997 } elseif (is_object($value)) { 998 $value = (string) $value; 1017 999 } 1018 1000 fDatabase.php
r235 r242 Hide Line Numbers 642 642 if (is_object($value) && is_callable(array($value, '__toString'))) { 643 643 $value = $value->__toString(); 644 } elseif (is_object($value)) { 645 $value = (string) $value; 644 646 } 645 647 $new_values[] = $value; fDate.php
r239 r242 Hide Line Numbers 40 40 if (is_object($date) && is_callable(array($date, '__toString'))) { 41 41 $date = $date->__toString(); 42 } elseif (fCore::stringlike($date)) { 43 $date = (string) $date; 42 44 } 43 45 $timestamp = strtotime(fTimestamp::fixISOWeek($date)); fNumber.php
r214 r242 Hide Line Numbers 246 246 if (is_object($number) && is_callable(array($number, '__toString'))) { 247 247 $number = $number->__toString(); 248 } 249 $number = (string) $number; 248 } elseif (fCore::stringlike($number)) { 249 $number = (string) $number; 250 } 250 251 $number = trim($number); 251 252 fORM.php
r221 r242 Hide Line Numbers 326 326 $data = $data->__toString(); 327 327 } 328 $primary_key_data[$primary_key] = (string)$data;328 $primary_key_data[$primary_key] = $data; 329 329 } 330 330 return md5(serialize($primary_key_data)); … … 718 718 } 719 719 720 if (is_object($value) ) {720 if (is_object($value) && is_callable(array($value, '__toString'))) { 721 721 return $value->__toString(); 722 } 722 } elseif (is_object($value)) { 723 return (string) $value; 724 } 725 723 726 return $value; 724 727 } fORMDatabase.php
r236 r242 Hide Line Numbers 424 424 if (is_object($value) && is_callable(array($value, '__toString'))) { 425 425 $value = $value->__toString(); 426 } elseif (is_object($value)) { 427 $value = (string) $value; 426 428 } 427 429 $new_values[] = $value; fORMJSON.php
r222 r242 Hide Line Numbers 85 85 if (is_object($value) && is_callable(array($value, '__toString'))) { 86 86 $value = $value->__toString(); 87 } elseif (is_object($value)) { 88 $value = (string) $value; 87 89 } 88 90 $output[$column] = $value; fTime.php
r239 r242 Hide Line Numbers 40 40 if (is_object($time) && is_callable(array($time, '__toString'))) { 41 41 $time = $time->__toString(); 42 } elseif (fCore::stringlike($time)) { 43 $time = (string) $time; 42 44 } 43 45 $timestamp = strtotime($time); fTimestamp.php
r240 r242 Hide Line Numbers 718 718 if (is_object($datetime) && is_callable(array($datetime, '__toString'))) { 719 719 $datetime = $datetime->__toString(); 720 } elseif (fCore::stringlike($datetime)) { 721 $datetime = (string) $datetime; 720 722 } 721 723 $timestamp = strtotime(self::fixISOWeek($datetime) . ' ' . $timezone);
