Sfoglia il codice sorgente

* Make sure to scope models properly in ORM

Nathaniel van Diepen 7 anni fa
parent
commit
ef4eed7750
2 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 1 1
      ORM/relationship.class.php
  2. 3 3
      orm.abstract.class.php

+ 1 - 1
ORM/relationship.class.php

@@ -62,7 +62,7 @@
 					$model = $this->model;
 					$alias = $this->$alias;
 					$name = $this->name;
-					$class = "Models\\{$alias['model']}";
+					$class = "\\Models\\{$alias['model']}";
 					if(isset($model->has_many[$name])){
 						throw new \Exception("Invalid relationship {$name}");
 					}

+ 3 - 3
orm.abstract.class.php

@@ -383,15 +383,15 @@
 					$aliases = self::$aliases[$this->name];
 					if(isset($aliases['belongs_to'][$name])){
 						$alias = $aliases['has_many'][$name];
-						$class = "Models\\{$alias['model']}";
+						$class = "\\Models\\{$alias['model']}";
 						$this->_related[$name] = $class::fetch([$alias['foreign_key'] => $this->id])[0];
 					}elseif(isset($aliases['has_one'][$name])){
 						$alias = $aliases['has_many'][$name];
-						$class = "Models\\{$alias['model']}";
+						$class = "\\Models\\{$alias['model']}";
 						$this->_related[$name] = $class::instance($this[$alias['foreign_key']]);
 					}elseif(isset($aliases['has_many'][$name])){
 						$alias = $aliases['has_many'][$name];
-						$class = "Models\\{$alias['model']}";
+						$class = "\\Models\\{$alias['model']}";
 						$sql = "select ";
 						if($alias['through']){
 							$sql .= $class::table_name().$class::foreign_key_suffix()." id from {$alias['through']} ";