Merge remote-tracking branch 'origin' into hookhead

Conflicts:
	classes/feeds.php

fix for merging up to the origin

1 files changed, 20 insertions, 0 deletions

diff --git a/lib/floIcon.php b/lib/floIcon.php
new file mode 100644
index 000000000..11a102b50
--- /dev/null
+++ b/lib/floIcon.php
@@ -0,0 +1,20 @@
+<?php
+// Compatibility shim for hooking up jimIcon to Tiny Tiny RSS.
+
+require_once "jimIcon.php";
+
+class floIconIcon {
+        function getImageResource() {
+                return $this->img;
+        }
+}
+
+class floIcon {
+        function readICO($file) {
+                $jim = new jimIcon();
+                $icon = new floIconIcon();
+                $icon->img = $jim->fromiconstring(file_get_contents($file));
+                $this->images = array($icon);
+        }
+}
+?>