Improvements to SSL classes

This commit is contained in:
Deon George
2012-12-19 17:28:39 +11:00
parent 6588de4f7f
commit 863bc1150a
12 changed files with 535 additions and 238 deletions

View File

@@ -18,25 +18,6 @@ abstract class ORM extends Kohana_ORM {
// Our filters used to display values in a friendly format
protected $_display_filters = array();
// Override check() so that it doesnt throw an exception.
// @todo Need to figure out how to show the items that fail validation
final public function check(Validation $extra_validation = NULL) {
// Determine if any external validation failed
$extra_errors = ($extra_validation AND ! $extra_validation->check());
// Always build a new validation object
$this->_validation();
$array = $this->_validation;
if (($this->_valid = $array->check()) === FALSE OR $extra_errors)
{
return FALSE;
}
return $this;
}
// Add our OSB site_id to each SELECT query
final protected function _build($type) {
// Exclude tables without site ID's