remove deprecated theme_image()

diff --git a/classes/dlg.php b/classes/dlg.php
index 74eb9f633c79706afc9f84fa8c6cce8848505a50..3bb2caba4633ff8e6b69f4228eec6104c9a94d52 100644 (file)
--- 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 0568eb9850a89f602c474f3141cc4f415b8c6954..50a265544e1e4b3befdcc3099291d8797ebcb771 100644 (file)
--- 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 b297bbade5e3f2dd50a7fafa1d3f47aef87d5913..139f1fe49e0012503710f65dad3ffddefcf4a881 100644 (file)
--- 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() {

diff --git a/include/functions.php b/include/functions.php
index 417a05c2354862405c5f7364bca0d0f00bf2ac80..c917354882f9025d5bcb992da714c6cac882bc87 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -786,11 +786,6 @@
                }
        }
 
-       // Deprecated, TODO: remove
-       function theme_image($link, $filename) {
-               return $filename;
-       }
-
        function convert_timestamp($timestamp, $source_tz, $dest_tz) {
 
                try {
@@ -1825,10 +1820,10 @@
        function make_init_params($link) {
                $params = array();
 
-               $params["sign_progress"] = theme_image($link, "images/indicator_white.gif");
-               $params["sign_progress_tiny"] = theme_image($link, "images/indicator_tiny.gif");
-               $params["sign_excl"] = theme_image($link, "images/sign_excl.svg");
-               $params["sign_info"] = theme_image($link, "images/sign_info.svg");
+               $params["sign_progress"] = "images/indicator_white.gif";
+               $params["sign_progress_tiny"] = "images/indicator_tiny.gif";
+               $params["sign_excl"] = "images/sign_excl.svg";
+               $params["sign_info"] = "images/sign_info.svg";
 
                foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
                        "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
@@ -2839,19 +2834,19 @@
        function format_warning($msg, $id = "") {
                global $link;
                return "<div class=\"warning\" id=\"$id\">
-                       <img src=\"".theme_image($link, "images/sign_excl.svg")."\">$msg</div>";
+                       <img src=\"images/sign_excl.svg\">$msg</div>";
        }
 
        function format_notice($msg, $id = "") {
                global $link;
                return "<div class=\"notice\" id=\"$id\">
-                       <img src=\"".theme_image($link, "images/sign_info.svg")."\">$msg</div>";
+                       <img src=\"images/sign_info.svg\">$msg</div>";
        }
 
        function format_error($msg, $id = "") {
                global $link;
                return "<div class=\"error\" id=\"$id\">
-                       <img src=\"".theme_image($link, "images/sign_excl.svg")."\">$msg</div>";
+                       <img src=\"images/sign_excl.svg\">$msg</div>";
        }
 
        function print_notice($msg) {
@@ -3040,7 +3035,7 @@
                        if (!$entry_comments) $entry_comments = "&nbsp;"; # placeholder
 
                        $rv['content'] .= "<div class='postTags' style='float : right'>
-                               <img src='".theme_image($link, 'images/tag.png')."'
+                               <img src='images/tag.png'
                                class='tagsPic' alt='Tags' title='Tags'>&nbsp;";
 
                        if (!$zoom_mode) {

diff --git a/index.php b/index.php
index 57a370d91f00d6661d50ca3fcd5c43fdc5633663..4cbd756a39af09de856c00cd7c934485ef47c2f7 100644 (file)
--- a/index.php
+++ b/index.php
@@ -128,11 +128,11 @@
 <div id="header">
        <img id="net-alert" style="display : none"
                title="<?php echo __("Communication problem with server.") ?>"
-               src="<?php echo theme_image($link, 'images/alert.png') ?>"/>
+               src="images/alert.png"/>
 
        <img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"
                width="13" height="13"
-               src="<?php echo theme_image($link, 'images/new_version.png') ?>"
+               src="images/new_version.png"
                title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>"
                alt="new_version_icon"/>
 </div>
@@ -201,12 +201,12 @@
                        <button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
                                title="<?php echo __("Communication problem with server.") ?>">
                        <img
-                               src="<?php echo theme_image($link, 'images/alert.png') ?>" />
+                               src="images/alert.png" />
                        </button>
 
                        <button id="newVersionIcon" dojoType="dijit.form.Button" style="display : none">
                        <img onclick="newVersionDlg()"
-                               src="<?php echo theme_image($link, 'images/new_version.png') ?>"
+                               src="images/new_version.png"
                                title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" />
                        </button>
 

diff --git a/plugins/close_button/init.php b/plugins/close_button/init.php
index bf41833200644ac6c6b8cab9ae0f2f53d8edf863..ff2027bc78cd7c98351b018c8bc13adfd79f6b5b 100644 (file)
--- a/plugins/close_button/init.php
+++ b/plugins/close_button/init.php
@@ -18,7 +18,7 @@ class Close_Button extends Plugin {
 
        function hook_article_button($line) {
                if (!get_pref($this->link, "COMBINED_DISPLAY_MODE")) {
-                       $rv = "<img src=\"".theme_image($this->link, 'plugins/close_button/button.png')."\"
+                       $rv = "<img src=\"plugins/close_button/button.png\"
                                class='tagsPic' style=\"cursor : pointer\"
                                onclick=\"closeArticlePanel()\"
                                title='".__('Close article')."'>";

diff --git a/plugins/flattr/init.php b/plugins/flattr/init.php
index d5e4ad0259b71f4fa630c5f226da91b7755e083b..b9101988046635cfc1cb6b1de827403c09de30ac 100644 (file)
--- a/plugins/flattr/init.php
+++ b/plugins/flattr/init.php
@@ -25,7 +25,7 @@ class Flattr extends Plugin {
         $encoded = urlencode($article_link);
         $r = file_get_contents("https://api.flattr.com/rest/v2/things/lookup/?url=$encoded");
         $response = json_decode($r, true);
-        $image = "<img src=\"".theme_image($this->link, 'plugins/flattr/flattr.png')."\"
+        $image = "<img src=\"plugins/flattr/flattr.png\"
                        class='tagsPic' style=\"cursor : pointer\"
                        title='".__('Flattr this article.')."'>";
         // if Flattr has it in the catalogue, we display the button

diff --git a/plugins/googleplus/init.php b/plugins/googleplus/init.php
index 3d6c608874204152aef67aa8f288140173298952..7ae6d14565e8340d8054926d104c15f48984816f 100644 (file)
--- a/plugins/googleplus/init.php
+++ b/plugins/googleplus/init.php
@@ -23,7 +23,7 @@ class GooglePlus extends Plugin {
        function hook_article_button($line) {
                $article_id = $line["id"];
 
-               $rv = "<img src=\"".theme_image($this->link, 'plugins/googleplus/googleplus.png')."\"
+               $rv = "<img src=\"plugins/googleplus/googleplus.png\"
                        class='tagsPic' style=\"cursor : pointer\"
                        onclick=\"shareArticleToGooglePlus($article_id)\"
                        title='".__('Share on Google+')."'>";

diff --git a/plugins/identica/init.php b/plugins/identica/init.php
index c260334af1f8d122d75bdc517885fac491306cb4..c9aa4118eafa353448d60914eccb11b3e4dbdb9a 100644 (file)
--- a/plugins/identica/init.php
+++ b/plugins/identica/init.php
@@ -23,7 +23,7 @@ class Identica extends Plugin {
        function hook_article_button($line) {
                $article_id = $line["id"];
 
-               $rv = "<img src=\"".theme_image($this->link, 'plugins/identica/identica.png')."\"
+               $rv = "<img src=\"plugins/identica/identica.png\"
                        class='tagsPic' style=\"cursor : pointer\"
                        onclick=\"shareArticleToIdentica($article_id)\"
                        title='".__('Share on identi.ca')."'>";

diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 84fd5d3b26a632027758abcbb2b4ab49f9c5c2a6..30a417a1b44104b2caa38f3b57e2580cb962c469 100644 (file)
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -22,7 +22,7 @@ class Mail extends Plugin {
        }
 
        function hook_article_button($line) {
-               return "<img src=\"".theme_image($link, 'plugins/mail/mail.png')."\"
+               return "<img src=\"plugins/mail/mail.png\"
                                        class='tagsPic' style=\"cursor : pointer\"
                                        onclick=\"emailArticle(".$line["id"].")\"
                                        alt='Zoom' title='".__('Forward by email')."'>";

diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index bbc0dffa41ba5ba40db2202f935da6eed22a86bf..8d175ae1c77acafa4a19700bb12fa7e2b2e16bf9 100644 (file)
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -22,7 +22,7 @@ class MailTo extends Plugin {
        }
 
        function hook_article_button($line) {
-               return "<img src=\"".theme_image($link, 'plugins/mailto/mail.png')."\"
+               return "<img src=\"plugins/mailto/mail.png\"
                                        class='tagsPic' style=\"cursor : pointer\"
                                        onclick=\"mailtoArticle(".$line["id"].")\"
                                        alt='Zoom' title='".__('Forward by email')."'>";

diff --git a/plugins/note/init.php b/plugins/note/init.php
index 560796a692267244c679dbc093e992a734e326b3..83db942486672451e9bd368d2f6d1f96052b97ed 100644 (file)
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -22,7 +22,7 @@ class Note extends Plugin {
 
 
        function hook_article_button($line) {
-               return "<img src=\"".theme_image($this->link, "plugins/note/note.png")."\"
+               return "<img src=\"plugins/note/note.png\"
                        style=\"cursor : pointer\" style=\"cursor : pointer\"
                        onclick=\"editArticleNote(".$line["id"].")\"
                        class='tagsPic' title='".__('Edit article note')."'>";

diff --git a/plugins/owncloud/init.php b/plugins/owncloud/init.php
index b846241b87efab923466994ee2f4fb0358b9f81d..48377e9d97cfa48525a64e5b29eecb9996fa886f 100644 (file)
--- a/plugins/owncloud/init.php
+++ b/plugins/owncloud/init.php
@@ -68,7 +68,7 @@ class OwnCloud extends Plugin {
   }
 
   function hook_article_button($line) {
-    return "<img src=\"".theme_image($this->link, "plugins/owncloud/owncloud.png")."\"
+    return "<img src=\"plugins/owncloud/owncloud.png\"
              style=\"cursor : pointer\" style=\"cursor : pointer\"
              onclick=\"ownArticle(".$line["id"].")\"
              class='tagsPic' title='".__('Bookmark on OwnCloud ')."'>";

diff --git a/plugins/pinterest/init.php b/plugins/pinterest/init.php
index aef9d8511ba8c58621f6f69423424b32098fc2fa..96c730e846ccc97d23e504881ba65f162808a0f5 100644 (file)
--- a/plugins/pinterest/init.php
+++ b/plugins/pinterest/init.php
@@ -23,7 +23,7 @@ class Pinterest extends Plugin {
        function hook_article_button($line) {
                $article_id = $line["id"];
 
-               $rv = "<img src=\"".theme_image($this->link, 'plugins/pinterest/pinterest.png')."\"
+               $rv = "<img src=\"plugins/pinterest/pinterest.png\"
                        class='tagsPic' style=\"cursor : pointer\"
                        onclick=\"pinterest($article_id)\"
                        title='".__('Pinterest')."'>";

diff --git a/plugins/pocket/init.php b/plugins/pocket/init.php
index 3fc51dd91e632050592b58cea46d97dc967ed74d..688a6258d3b6e24fcbbf99b21433e661b2ae0ac0 100644 (file)
--- a/plugins/pocket/init.php
+++ b/plugins/pocket/init.php
@@ -24,7 +24,7 @@ class Pocket extends Plugin {
        function hook_article_button($line) {
                $article_id = $line["id"];
 
-               $rv = "<img src=\"".theme_image($this->link, 'plugins/pocket/pocket.png')."\"
+               $rv = "<img src=\"plugins/pocket/pocket.png\"
                        class='tagsPic' style=\"cursor : pointer\"
                        onclick=\"shareArticleToPocket($article_id)\"
                        title='".__('Pocket')."'>";

diff --git a/plugins/share/init.php b/plugins/share/init.php
index e1151849b8ebc26c85c65112d3f5f51e937e79b1..f52d2a4fa62839d946ac68876d6731d0e73dfdcd 100644 (file)
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -21,7 +21,7 @@ class Share extends Plugin {
        }
 
        function hook_article_button($line) {
-               return "<img src=\"".theme_image($this->link, 'plugins/share/share.png')."\"
+               return "<img src=\"plugins/share/share.png\"
                        class='tagsPic' style=\"cursor : pointer\"
                        onclick=\"shareArticle(".$line['int_id'].")\"
                        title='".__('Share by URL')."'>";

diff --git a/plugins/tweet/init.php b/plugins/tweet/init.php
index e7f8ce949e850b3c61dcb0e84565a00b1e0acf23..2d20c7187c6a433f18e516b4b4898ab72808ab40 100644 (file)
--- a/plugins/tweet/init.php
+++ b/plugins/tweet/init.php
@@ -23,7 +23,7 @@ class Tweet extends Plugin {
        function hook_article_button($line) {
                $article_id = $line["id"];
 
-               $rv = "<img src=\"".theme_image($this->link, 'plugins/tweet/tweet.png')."\"
+               $rv = "<img src=\"plugins/tweet/tweet.png\"
                        class='tagsPic' style=\"cursor : pointer\"
                        onclick=\"tweetArticle($article_id)\"
                        title='".__('Share on Twitter')."'>";