From: Joschasa Date: Wed, 20 Mar 2013 21:59:08 +0000 (+0100) Subject: remove deprecated theme_image() X-Git-Tag: 1.7.5~62^2~1 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=2a3b6de0efd66a9643bce7ded70288d0ddf9fb24;p=tt-rss.git remove deprecated theme_image() --- diff --git a/classes/dlg.php b/classes/dlg.php index 74eb9f63..3bb2caba 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -236,8 +236,7 @@ class Dlg extends Handler_Protected { print "
"; + id='feed_add_spinner' src='images/indicator_white.gif'>"; print "
+ id='feed_browser_spinner' src='images/indicator_white.gif'> diff --git a/classes/feeds.php b/classes/feeds.php index 0568eb98..50a26554 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 = "link, 'images/mark_set.svg')."\" + src=\"images/mark_set.svg\" class=\"markedPic\" alt=\"Unstar article\" onclick='javascript:toggleMark($id)'>"; } else { $marked_pic = "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 = "link, - 'images/pub_set.svg')."\" + $published_pic = "\"Unpublish"; } else { - $published_pic = "link, - 'images/pub_unset.svg')."\" + $published_pic = "\"Publish"; } @@ -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 = "link, - 'images/tag.png')."' alt='Tags' title='Tags'> + $reply['content'] .= "Tags $tags_str (+)"; diff --git a/classes/rpc.php b/classes/rpc.php index b297bbad..139f1fe4 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() { diff --git a/include/functions.php b/include/functions.php index 417a05c2..c9173548 100644 --- 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 "
- $msg
"; + $msg
"; } function format_notice($msg, $id = "") { global $link; return "
- $msg
"; + $msg"; } function format_error($msg, $id = "") { global $link; return "
- $msg
"; + $msg"; } function print_notice($msg) { @@ -3040,7 +3035,7 @@ if (!$entry_comments) $entry_comments = " "; # placeholder $rv['content'] .= "
- Tags "; if (!$zoom_mode) { diff --git a/index.php b/index.php index 57a370d9..4cbd756a 100644 --- a/index.php +++ b/index.php @@ -128,11 +128,11 @@ @@ -201,12 +201,12 @@ diff --git a/plugins/close_button/init.php b/plugins/close_button/init.php index bf418332..ff2027bc 100644 --- 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 = "link, 'plugins/close_button/button.png')."\" + $rv = ""; diff --git a/plugins/flattr/init.php b/plugins/flattr/init.php index d5e4ad02..b9101988 100644 --- 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 = "link, 'plugins/flattr/flattr.png')."\" + $image = ""; // if Flattr has it in the catalogue, we display the button diff --git a/plugins/googleplus/init.php b/plugins/googleplus/init.php index 3d6c6088..7ae6d145 100644 --- 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 = "link, 'plugins/googleplus/googleplus.png')."\" + $rv = ""; diff --git a/plugins/identica/init.php b/plugins/identica/init.php index c260334a..c9aa4118 100644 --- 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 = "link, 'plugins/identica/identica.png')."\" + $rv = ""; diff --git a/plugins/mail/init.php b/plugins/mail/init.php index 84fd5d3b..30a417a1 100644 --- a/plugins/mail/init.php +++ b/plugins/mail/init.php @@ -22,7 +22,7 @@ class Mail extends Plugin { } function hook_article_button($line) { - return "Zoom"; diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php index bbc0dffa..8d175ae1 100644 --- a/plugins/mailto/init.php +++ b/plugins/mailto/init.php @@ -22,7 +22,7 @@ class MailTo extends Plugin { } function hook_article_button($line) { - return "Zoom"; diff --git a/plugins/note/init.php b/plugins/note/init.php index 560796a6..83db9424 100644 --- a/plugins/note/init.php +++ b/plugins/note/init.php @@ -22,7 +22,7 @@ class Note extends Plugin { function hook_article_button($line) { - return "link, "plugins/note/note.png")."\" + return ""; diff --git a/plugins/owncloud/init.php b/plugins/owncloud/init.php index b846241b..48377e9d 100644 --- a/plugins/owncloud/init.php +++ b/plugins/owncloud/init.php @@ -68,7 +68,7 @@ class OwnCloud extends Plugin { } function hook_article_button($line) { - return "link, "plugins/owncloud/owncloud.png")."\" + return ""; diff --git a/plugins/pinterest/init.php b/plugins/pinterest/init.php index aef9d851..96c730e8 100644 --- 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 = "link, 'plugins/pinterest/pinterest.png')."\" + $rv = ""; diff --git a/plugins/pocket/init.php b/plugins/pocket/init.php index 3fc51dd9..688a6258 100644 --- 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 = "link, 'plugins/pocket/pocket.png')."\" + $rv = ""; diff --git a/plugins/share/init.php b/plugins/share/init.php index e1151849..f52d2a4f 100644 --- a/plugins/share/init.php +++ b/plugins/share/init.php @@ -21,7 +21,7 @@ class Share extends Plugin { } function hook_article_button($line) { - return "link, 'plugins/share/share.png')."\" + return ""; diff --git a/plugins/tweet/init.php b/plugins/tweet/init.php index e7f8ce94..2d20c718 100644 --- 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 = "link, 'plugins/tweet/tweet.png')."\" + $rv = "";