summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-01-31 13:22:36 +0300
committerAndrew Dolgov <[email protected]>2011-01-31 13:22:36 +0300
commitb899847009e0bc0dc8e35cec6bba8cd72eb1bb23 (patch)
treee23782446704fc03ca1d7f41b1bd54cbe6d0f53d
parent53fd549523c31a80d2a53362db732d7af2e2d644 (diff)
implement a proper fix of cached images URL (refs #305, closes #300)
-rw-r--r--functions.php11
1 files changed, 5 insertions, 6 deletions
diff --git a/functions.php b/functions.php
index 83cdca3f7..0a7559368 100644
--- a/functions.php
+++ b/functions.php
@@ -653,13 +653,11 @@
if (SIMPLEPIE_CACHE_IMAGES && $cache_images) {
- $image_handler = get_self_url_prefix() . '/image.php';
-
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("enabling image cache: $image_handler");
+ _debug("enabling image cache");
}
- $rss->set_image_handler($image_handler, 'i');
+ $rss->set_image_handler("image.php", 'i');
}
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
@@ -3714,8 +3712,9 @@
rewrite_relative_url($site_url, $entry->getAttribute('href')));
if ($entry->hasAttribute('src'))
- $entry->setAttribute('src',
- rewrite_relative_url($site_url, $entry->getAttribute('src')));
+ if (preg_match('/^image.php\?i=[a-z0-9]+$/', $entry->getAttribute('src')) == 0)
+ $entry->setAttribute('src',
+ rewrite_relative_url($site_url, $entry->getAttribute('src')));
}
if (strtolower($entry->nodeName) == "a") {