Merge remote-tracking branch 'xpdo/develop' into release-2.2

* xpdo/develop: [#8320] Preserve order of $columns in xPDOObject::getSelectColumns() Deprecate xPDO->getMicroTime()
WebsiteDeveloper · Jul 24, 2012 · d1c443a · d1c443a
2 parents 2a396fc + 1d3f920
commit d1c443a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 15 deletions.
diff --git a/core/xpdo/changelog.txt b/core/xpdo/changelog.txt
@@ -1,5 +1,7 @@
 This file shows the changes in this release of xPDO.
 
+- [#8320] Preserve order of $columns in xPDOObject::getSelectColumns()
+- Deprecate xPDO->getMicroTime()
 - [#8176] xPDO->updateCollection() fails to set NULL values
 
 xPDO 2.2.5-pl (June 1, 2012)

diff --git a/core/xpdo/om/xpdoobject.class.php b/core/xpdo/om/xpdoobject.class.php
@@ -563,20 +563,32 @@ public static function getSelectColumns(xPDO & $xpdo, $className, $tableAlias= '
                 $tableAlias= $xpdo->escape($tableAlias);
                 $tableAlias.= '.';
             }
-            foreach (array_keys($aColumns) as $k) {
-                if ($exclude && in_array($k, $columns)) {
-                    continue;
-                }
-                elseif (empty ($columns)) {
-                    $columnarray[$k]= "{$tableAlias}" . $xpdo->escape($k);
-                }
-                elseif ($exclude || in_array($k, $columns)) {
-                    $columnarray[$k]= "{$tableAlias}" . $xpdo->escape($k);
-                } else {
-                    continue;
+            if (!$exclude && !empty($columns)) {
+                foreach ($columns as $column) {
+                    if (!in_array($column, array_keys($aColumns))) {
+                        continue;
+                    }
+                    $columnarray[$column]= "{$tableAlias}" . $xpdo->escape($column);
+                    if (!empty ($columnPrefix)) {
+                        $columnarray[$column]= $columnarray[$column] . " AS " . $xpdo->escape("{$columnPrefix}{$column}");
+                    }
                 }
-                if (!empty ($columnPrefix)) {
-                    $columnarray[$k]= $columnarray[$k] . " AS " . $xpdo->escape("{$columnPrefix}{$k}");
+            } else {
+                foreach (array_keys($aColumns) as $k) {
+                    if ($exclude && in_array($k, $columns)) {
+                        continue;
+                    }
+                    elseif (empty ($columns)) {
+                        $columnarray[$k]= "{$tableAlias}" . $xpdo->escape($k);
+                    }
+                    elseif ($exclude || in_array($k, $columns)) {
+                        $columnarray[$k]= "{$tableAlias}" . $xpdo->escape($k);
+                    } else {
+                        continue;
+                    }
+                    if (!empty ($columnPrefix)) {
+                        $columnarray[$k]= $columnarray[$k] . " AS " . $xpdo->escape("{$columnPrefix}{$k}");
+                    }
                 }
             }
         }

diff --git a/core/xpdo/xpdo.class.php b/core/xpdo/xpdo.class.php
@@ -2506,11 +2506,11 @@ public function setAttribute($attribute, $value) {
     /**
      * Convert current microtime() result into seconds.
      *
+     * @deprecated Use microtime(true) directly; this was to emulate PHP 5 behavior in PHP 4.
      * @return float
      */
     public function getMicroTime() {
-       list($usec, $sec) = explode(' ', microtime());
-       return ((float)$usec + (float)$sec);
+       return microtime(true);
     }
 
     /**