some workaround for PHP warnings

OpencachingDeutschland · Feb 8, 2013 · 57d6655 · 57d6655
1 parent 4b0a5da
commit 57d6655
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/htdocs/lib2/OcSmarty.class.php b/htdocs/lib2/OcSmarty.class.php
@@ -135,7 +135,7 @@ function compile($resource_name, $compile_id = null)
 		$this->_cache_including = $_cache_including;
 	}
 
-	function display()
+	function display($dummy1=null, $dummy2=null, $dummy3=null)
 	{
 		global $opt, $db, $cookie, $login, $menu, $sqldebugger, $translate;
 		$cookie->close();
@@ -303,7 +303,7 @@ function error($id)
 	}
 
 	// check if this template is valid
-	function is_cached()
+	function is_cached($dummy1=null, $dummy2=null, $dummy3=null)
 	{
 		global $login;
 

diff --git a/htdocs/lib2/logic/useroptions.class.php b/htdocs/lib2/logic/useroptions.class.php
@@ -105,7 +105,7 @@ function setOptValue($pId, $pValue)
 			$this->nOptions[$pId]['option_value'] = $pValue;
 			return true;
 		}
-		else if (ereg($this->nOptions[$pId]['check_regex'], $pValue) || strlen($pValue) == 0)
+		else if (preg_match("/" . $this->nOptions[$pId]['check_regex'] . "/", $pValue) || strlen($pValue) == 0)
 		{
 			$this->nOptions[$pId]['option_value'] = $pValue;
 			return true;
@@ -128,7 +128,7 @@ function save()
 
   function tidy_html_description($text)
   {
-    $options = array("input-encoding" => "utf8", "output-encoding" => "utf8", "output-xhtml" => true, "doctype" => "omit", "show-body-only" => true, "char-encoding" => "utf8", "quote-ampersand" => true, "quote-nbsp" => true, "wrap" => 0);
+    $options = array("input-encoding" => "utf8", "output-encoding" => "utf8", "output-xhtml" => true, "doctype" => "omit", "show-body-only" => true, "char-encoding" => "utf8", "quote-ampersand" => true, "quote-nbsp" => true, "wrap" => 0);
     $config = HTMLPurifier_Config::createDefault();
     $cssDefinition = $config->getCSSDefinition();