OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
following
2013-02-08 14:15:18 +01:00
parent 3784010ca4 57d665592b
commit 37ee57d388
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/lib2/OcSmarty.class.php
+2 -2
View File
@@ -135,7 +135,7 @@ class OcSmarty extends Smarty
$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 @@ class OcSmarty extends Smarty
}
// check if this template is valid
function is_cached()
function is_cached($dummy1=null, $dummy2=null, $dummy3=null)
{
global $login;
htdocs/lib2/logic/useroptions.class.php
+1 -1
View File
@@ -105,7 +105,7 @@ class useroptions
$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;