# HG changeset patch
# User Dan
# Date 1261428065 18000
# Node ID 5882f0eebb34624310b661ad94306392d24d69c2
# Parent  ffa3a49385135e66567a3db3b98cb3c37972393a
Fixed two "declaration should be compatible" errors encountered by the BitNami folks. Thanks Neal for reporting.

diff -r ffa3a4938513 -r 5882f0eebb34 includes/namespaces/special.php
--- a/includes/namespaces/special.php	Sat Dec 19 16:06:29 2009 -0500
+++ b/includes/namespaces/special.php	Mon Dec 21 15:41:05 2009 -0500
@@ -82,7 +82,7 @@
   }
   
   // We add the unused variable $userpage here to silence "declaration should be compatible" errors
-  function error_404($userpage = false)
+  function error_404()
   {
     global $lang, $output;
     $func_name = "page_{$this->namespace}_{$this->page_id}";
diff -r ffa3a4938513 -r 5882f0eebb34 includes/template.php
--- a/includes/template.php	Sat Dec 19 16:06:29 2009 -0500
+++ b/includes/template.php	Mon Dec 21 15:41:05 2009 -0500
@@ -3305,7 +3305,7 @@
    * Assigns an array of string values to the template. Strings can be accessed from the template by inserting {KEY_NAME} in the template file.
    * @param $vars array
    */
-  function assign_vars($vars)
+  function assign_vars($vars, $_ignored = false)
   {
     if(is_array($this->tpl_strings))
       $this->tpl_strings = array_merge($this->tpl_strings, $vars);
@@ -3350,7 +3350,7 @@
    * Assigns an array of string values to the template. Strings can be accessed from the template by inserting {KEY_NAME} in the template file.
    * @param $vars array
    */
-  function assign_vars($vars)
+  function assign_vars($vars, $_ignored = false)
   {
     if(is_array($this->tpl_strings))
       $this->tpl_strings = array_merge($this->tpl_strings, $vars);