From 2a3b6de0efd66a9643bce7ded70288d0ddf9fb24 Mon Sep 17 00:00:00 2001
From: Joschasa <joschasa@lavabit.com>
Date: Wed, 20 Mar 2013 22:59:08 +0100
Subject: remove deprecated theme_image()

---
 classes/dlg.php   |  6 ++----
 classes/feeds.php | 16 ++++++----------
 classes/rpc.php   |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'classes')

diff --git a/classes/dlg.php b/classes/dlg.php
index 74eb9f633..3bb2caba4 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -236,8 +236,7 @@ class Dlg extends Handler_Protected {
 
 		print "<div style='float : right'>
 			<img style='display : none'
-				id='feed_add_spinner' src='".
-				theme_image($this->link, 'images/indicator_white.gif')."'></div>";
+				id='feed_add_spinner' src='images/indicator_white.gif'></div>";
 
 		print "<input style=\"font-size : 16px; width : 20em;\"
 			placeHolder=\"".__("Feed or site URL")."\"
@@ -311,8 +310,7 @@ class Dlg extends Handler_Protected {
 		print "<div dojoType=\"dijit.Toolbar\">
 			<div style='float : right'>
 			<img style='display : none'
-				id='feed_browser_spinner' src='".
-				theme_image($this->link, 'images/indicator_white.gif')."'>
+				id='feed_browser_spinner' src='images/indicator_white.gif'>
 			<input name=\"search\" dojoType=\"dijit.form.TextBox\" size=\"20\" type=\"search\"
 				onchange=\"dijit.byId('feedBrowserDlg').update()\" value=\"$browser_search\">
 			<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedBrowserDlg').update()\">".__('Search')."</button>
diff --git a/classes/feeds.php b/classes/feeds.php
index 0568eb985..50a265544 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -321,24 +321,22 @@ class Feeds extends Handler_Protected {
 
 				if ($line["marked"] == "t" || $line["marked"] == "1") {
 					$marked_pic = "<img id=\"FMPIC-$id\"
-						src=\"".theme_image($this->link, 'images/mark_set.svg')."\"
+						src=\"images/mark_set.svg\"
 						class=\"markedPic\" alt=\"Unstar article\"
 						onclick='javascript:toggleMark($id)'>";
 				} else {
 					$marked_pic = "<img id=\"FMPIC-$id\"
-						src=\"".theme_image($this->link, 'images/mark_unset.svg')."\"
+						src=\"images/mark_unset.svg\"
 						class=\"markedPic\" alt=\"Star article\"
 						onclick='javascript:toggleMark($id)'>";
 				}
 
 				if ($line["published"] == "t" || $line["published"] == "1") {
-					$published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($this->link,
-						'images/pub_set.svg')."\"
+					$published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_set.svg\"
 						class=\"markedPic\"
 						alt=\"Unpublish article\" onclick='javascript:togglePub($id)'>";
 				} else {
-					$published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($this->link,
-						'images/pub_unset.svg')."\"
+					$published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_unset.svg\"
 						class=\"markedPic\"
 						alt=\"Publish article\" onclick='javascript:togglePub($id)'>";
 				}
@@ -363,8 +361,7 @@ class Feeds extends Handler_Protected {
 
 				$score = $line["score"];
 
-				$score_pic = theme_image($this->link,
-					"images/" . get_score_pic($score));
+				$score_pic = "images/" . get_score_pic($score);
 
 /*				$score_title = __("(Click to change)");
 				$score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"
@@ -650,8 +647,7 @@ class Feeds extends Handler_Protected {
 
 					$tags_str = format_tags_string($line["tags"], $id);
 
-					$reply['content'] .= "<img src='".theme_image($this->link,
-							'images/tag.png')."' alt='Tags' title='Tags'>
+					$reply['content'] .= "<img src='images/tag.png' alt='Tags' title='Tags'>
 						<span id=\"ATSTR-$id\">$tags_str</span>
 						<a title=\"".__('Edit tags for this article')."\"
 						href=\"#\" onclick=\"editArticleTags($id, $feed_id, true)\">(+)</a>";
diff --git a/classes/rpc.php b/classes/rpc.php
index b297bbade..139f1fe49 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -663,7 +663,7 @@ class RPC extends Handler_Protected {
 			score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
 		print json_encode(array("id" => $id,
-			"score_pic" => theme_image($link, get_score_pic($score))));
+			"score_pic" => get_score_pic($score)));
 	}
 
 	function setpanelmode() {
-- 
cgit v1.2.3