dblayeroo : update to ORDER in the well known order

git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3540 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
2017-04-25 12:03:57 +00:00
parent 152cd7048f
commit 48ce12accc
2 changed files with 10 additions and 9 deletions

View File

@@ -1701,11 +1701,7 @@ class dblayeroo
{
$order = array ();
if ($this->joinObject)
{
foreach ($this->joinObject as $obj)
$order = array_merge ($order, $obj->orderGet (true));
$full = true;
}
foreach ($this->orderExpression as $o)
{
if ($full !== false)
@@ -1713,6 +1709,11 @@ class dblayeroo
else
$order[] = $o;
}
if ($this->joinObject)
{
foreach ($this->joinObject as $obj)
$order = array_merge ($order, $obj->orderGet (true));
}
return $order;
}
/* }}} */