dbObject: do not add table name in join() if table name already specified

Author: avbdr

dbObject.php

@@ -403,15 +403,12 @@ private function join ($objectName, $key = null, $joinType = 'LEFT', $primaryKey
             $key = $objectName . "id";
 
         if (!$primaryKey)
-            $primaryKey = $joinObj->primaryKey;
+            $primaryKey = MysqliDb::$prefix . $joinObj->dbTable . "." . $joinObj->primaryKey;
 
-        if (!strchr ($key, '.')) {
-            $joinStr = MysqliDb::$prefix . $this->dbTable . ".{$key} = " .
-                    MysqliDb::$prefix . "{$joinObj->dbTable}.{$joinObj->primaryKey}";
-        } else {
-            $joinStr = MysqliDb::$prefix . "{$key} = " .
-                    MysqliDb::$prefix . "{$joinObj->dbTable}.{$joinObj->primaryKey}";
-        }
+        if (!strchr ($key, '.'))
+            $joinStr = MysqliDb::$prefix . $this->dbTable . ".{$key} = " . $primaryKey;
+        else
+            $joinStr = MysqliDb::$prefix . "{$key} = " . $primaryKey;
 
         $this->db->join ($joinObj->dbTable, $joinStr, $joinType);
         return $this;