diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index 8ca25c39..5dcb91a1 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -207,7 +207,7 @@ class locales_Core {
 
       arsort($scored_locales);
 
-      list ($locale) = each($scored_locales);
+      $locale = key($scored_locales);
       return $locale;
     }
 
diff --git a/system/libraries/Database_Builder.php b/system/libraries/Database_Builder.php
index e86ce379..1d8c9f91 100644
--- a/system/libraries/Database_Builder.php
+++ b/system/libraries/Database_Builder.php
@@ -1183,7 +1183,8 @@ class Database_Builder_Core {
 
 		foreach ($this->order_by as $column => $order_by)
 		{
-			list($column, $direction) = each($order_by);
+			$column = key($order_by);
+			$direction = current($order_by);
 
 			$column = $this->db->quote_column($column);