fixed fatal dml conversion regression
authorPetr Skoda <skodak@moodle.org>
Sat, 18 Sep 2010 11:20:21 +0000 (11:20 +0000)
committerPetr Skoda <skodak@moodle.org>
Sat, 18 Sep 2010 11:20:21 +0000 (11:20 +0000)
lib/tablelib.php

index b86a70b..c87cc1b 100644 (file)
@@ -1333,7 +1333,7 @@ class table_sql extends flexible_table{
             list($wsql, $wparams) = $this->get_sql_where();
             if ($wsql) {
                 $this->countsql .= ' AND '.$wsql;
-                $this->countparams = arry_merge($this->countparams, $wparams);
+                $this->countparams = array_merge($this->countparams, $wparams);
 
                 $this->sql->where .= ' AND '.$wsql;
                 $this->sql->params = array_merge($this->sql->params, $wparams);