From 030db5b6c0489158b5a4cf1ab6d2542db0519de8 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Feb 2010 13:01:31 -0500
Subject: [PATCH] Better regex for template expressions + fix indentation
---
program/include/rcube_template.php | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index fef0eac..5bd9136 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -291,8 +291,8 @@
// prevent from endless loops
if ($exit != 'recur' && $this->app->plugins->is_processing('render_page')) {
raise_error(array('code' => 505, 'type' => 'php',
- 'file' => __FILE__, 'line' => __LINE__,
- 'message' => 'Recursion alert: ignoring output->send()'), true, false);
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => 'Recursion alert: ignoring output->send()'), true, false);
return;
}
$this->parse($templ, false);
@@ -555,7 +555,7 @@
* Parses expression and replaces variables
*
* @param string Expression statement
- * @return string Expression statement
+ * @return string Expression value
*/
private function parse_expression($expression)
{
@@ -563,9 +563,9 @@
array(
'/session:([a-z0-9_]+)/i',
'/config:([a-z0-9_]+)(:([a-z0-9_]+))?/i',
- '/env:([a-z0-9_]+)/i',
- '/request:([a-z0-9_]+)/i',
- '/cookie:([a-z0-9_]+)/i',
+ '/env:([a-z0-9_-]+)/i',
+ '/request:([a-z0-9_-]+)/i',
+ '/cookie:([a-z0-9_-]+)/i',
'/browser:([a-z0-9_]+)/i'
),
array(
--
Gitblit v1.9.1