Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fixes #8 #12

Merged
merged 2 commits into from

2 participants

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 20, 2012
  1. @untitaker

    Fixes #8

    untitaker authored
  2. @untitaker
This page is out of date. Refresh to see the latest.
View
8 www/.htaccess
@@ -9,8 +9,8 @@ RewriteRule !spouts/([^/]+)/(.*)$ - [C]
RewriteRule spouts/([^/]+)/(.*)$ plugins/$1/$2 [L]
# rule for favicons
-RewriteRule !data/icons/(.*)$ - [C]
-RewriteRule icons/(.*)$ data/icons/$1 [L]
+RewriteRule !data/favicons/(.*)$ - [C]
+RewriteRule favicons/(.*)$ data/favicons/$1 [L]
# rule for thumbnails
RewriteRule !data/thumbnails/(.*)$ - [C]
@@ -21,7 +21,7 @@ RewriteCond %{QUERY_STRING} ^(.*)$
RewriteRule !.(js|ico|gif|jpg|png|css|asc|txt|eot|woff|ttf|ttf|svg)$ index.php?%1
# rule for files
-RewriteRule !icons/ - [C]
+RewriteRule !favicons/ - [C]
RewriteRule !thumbnails - [C]
RewriteRule !public - [C]
RewriteRule !spouts - [C]
@@ -75,4 +75,4 @@ FileETag none
# Make sure proxies don't deliver the wrong content
Header append Vary User-Agent env=!dont-vary
</IfModule>
-</IfModule>
+</IfModule>
View
0  www/data/icons/empty.txt → www/data/favicons/empty.txt
File renamed without changes
View
4 www/helpers/ContentLoader.php
@@ -150,7 +150,7 @@ public function fetch($source) {
$iconAsPng = $imageHelper->loadImage($icon, 30, 30);
if($iconAsPng!==false) {
file_put_contents(
- 'data/icons/' . md5($icon) . '.png',
+ 'data/favicons/' . md5($icon) . '.png',
$iconAsPng
);
$newItem['icon'] = md5($icon) . '.png';
@@ -228,7 +228,7 @@ protected function cleanupFiles($type) {
$itemPath = 'data/thumbnails/';
} else if($type=='icons') {
$checker = function($file) { return \F3::get('im')->hasIcon($file);};
- $itemPath = 'data/icons/';
+ $itemPath = 'data/favicons/';
}
foreach(scandir($itemPath) as $file) {
View
4 www/templates/item.phtml
@@ -16,7 +16,7 @@
<?PHP echo $this->item['unread']==1 ? 'unread' : ''; ?>">
<a href="<?PHP echo $this->item['link']; ?>" class="entry-icon">
<?PHP if(strlen(trim($this->item['icon']))>0 && $this->item['icon']!="0") : ?>
- <img src="<?PHP echo 'icons/'.$this->item['icon']; ?>" alt="<?PHP echo $this->item['sourcetitle']; ?>" />
+ <img src="<?PHP echo 'favicons/'.$this->item['icon']; ?>" alt="<?PHP echo $this->item['sourcetitle']; ?>" />
<?PHP endif; ?>
</a>
<a href="<?PHP echo $this->item['link']; ?>" class="entry-source"><?PHP echo $this->item['sourcetitle']; ?></a>
@@ -34,4 +34,4 @@
<div class="entry-content">
<?PHP echo $content; ?>
</div>
-</div>
+</div>
Something went wrong with that request. Please try again.