Merge branch 'w27_MDL-40399_m25_msarrayshift' of https://github.com/s…

…kodak/moodle into MOODLE_25_STABLE
moodle · Jul 2, 2013 · d7e6261 · d7e6261
2 parents 0bde9de + fc4523f
commit d7e6261
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/dml/mssql_native_moodle_database.php b/lib/dml/mssql_native_moodle_database.php
@@ -625,8 +625,8 @@ protected function emulate_bound_params($sql, array $params=null) {
             return $sql;
         }
         // ok, we have verified sql statement with ? and correct number of params
-        $parts = explode('?', $sql);
-        $return = array_shift($parts);
+        $parts = array_reverse(explode('?', $sql));
+        $return = array_pop($parts);
         foreach ($params as $param) {
             if (is_bool($param)) {
                 $return .= (int)$param;
@@ -651,7 +651,7 @@ protected function emulate_bound_params($sql, array $params=null) {
                 $return .= "N'$param'";
             }
 
-            $return .= array_shift($parts);
+            $return .= array_pop($parts);
         }
         return $return;
     }

diff --git a/lib/dml/sqlsrv_native_moodle_database.php b/lib/dml/sqlsrv_native_moodle_database.php
@@ -709,8 +709,8 @@ protected function emulate_bound_params($sql, array $params = null) {
             return $sql;
         }
         // ok, we have verified sql statement with ? and correct number of params
-        $parts = explode('?', $sql);
-        $return = array_shift($parts);
+        $parts = array_reverse(explode('?', $sql));
+        $return = array_pop($parts);
         foreach ($params as $param) {
             if (is_bool($param)) {
                 $return .= (int)$param;
@@ -730,7 +730,7 @@ protected function emulate_bound_params($sql, array $params = null) {
                 $return .= "N'$param'";
             }
 
-            $return .= array_shift($parts);
+            $return .= array_pop($parts);
         }
         return $return;
     }