From 2dbc2d787a7d9acf85ac8b048d6a8a6c479ab428 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 20 Jun 2009 02:55:17 -0400
Subject: [PATCH] - typo (#1485933)
---
program/include/rcube_html_page.php | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index c83c6ae..446efa5 100644
--- a/program/include/rcube_html_page.php
+++ b/program/include/rcube_html_page.php
@@ -54,8 +54,8 @@
{
static $sa_files = array();
- if (!ereg('^https?://', $file) && $file[0] != '/')
- $file = $this->scripts_path . $file;
+ if (!preg_match('|^https?://|i', $file) && $file[0] != '/')
+ $file = $this->scripts_path . $file . (($fs = @filemtime($this->scripts_path . $file)) ? '?s='.$fs : '');
if (in_array($file, $sa_files)) {
return;
@@ -249,10 +249,19 @@
$__page_header = $__page_footer = '';
// correct absolute paths in images and other tags
- $output = preg_replace('/(src|href|background)=(["\']?)(\/[a-z0-9_\-]+)/Ui', "\\1=\\2$base_path\\3", $output);
+ $output = preg_replace('!(src|href|background)=(["\']?)(/[a-z0-9_-]+)!i', "\\1=\\2$base_path\\3", $output);
+ $output = preg_replace_callback('!(src|href)=(["\']?)([a-z0-9/_.-]+.(css|js))(["\'\s>])!i', array($this, 'add_filemtime'), $output);
$output = str_replace('$__skin_path', $base_path, $output);
echo rcube_charset_convert($output, 'UTF-8', $this->charset);
}
+
+ /**
+ * Callback function for preg_replace_callback in write()
+ */
+ public function add_filemtime($matches)
+ {
+ return sprintf("%s=%s%s?s=%d%s", $matches[1], $matches[2], $matches[3], @filemtime($matches[3]), $matches[5]);
+ }
}
--
Gitblit v1.9.1