From 418623f35e20f38d5f530c680d045f6a2de50dda Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 12 Apr 2010 09:57:18 -0400
Subject: [PATCH] You can now set an array of predefined values in a tform select field together with a datasource. The data of the "value" array and the datasource data get merged, so that the datasource data gets appended to the value array.
---
interface/lib/classes/tpl_cache.inc.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/tpl_cache.inc.php b/interface/lib/classes/tpl_cache.inc.php
index a4c6eec..18e7d38 100644
--- a/interface/lib/classes/tpl_cache.inc.php
+++ b/interface/lib/classes/tpl_cache.inc.php
@@ -82,7 +82,7 @@
* @return boolean
*/
function setCacheExtension($str = null) {
- if ($str == null || !ereg('^[a-z0-9]+$', strtolower($str))) return false;
+ if ($str == null || !preg_match('/^[a-z0-9]+$/', strtolower($str))) return false;
$this->OPTIONS['CACHE_EXTENSION'] = strtolower($str);
return true;
}
@@ -161,7 +161,7 @@
$filepath = dirname($file);
if (is_dir($filepath)) return true;
- $dirs = split('[\\/]', $filepath);
+ $dirs = preg_split('/[\\/]/', $filepath);
$currpath;
foreach ($dirs as $dir) {
$currpath .= $dir .'/';
--
Gitblit v1.9.1