From c71db656795e82055d114764ad93f71a968a2f28 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 21 Jul 2013 21:20:44 +0100 Subject: added tpl_classes() to return useful layout classes --- inc/template.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index a87650b84..087e2f9df 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1748,5 +1748,23 @@ function tpl_media() { echo ''.NL; } +/** + * Return useful layout classes + * + * @author Anika Henke + */ +function tpl_classes() { + global $ACT, $conf, $ID, $INFO; + $classes = array( + 'dokuwiki', + 'mode_'.$ACT, + 'tpl_'.$conf['template'], + ($_SERVER['REMOTE_USER']) ? 'loggedIn' : '', + ($INFO['exists']) ? '' : 'notFound', + ($ID == $conf['start']) ? 'home' : '', + ); + return join(' ', $classes); +} + //Setup VIM: ex: et ts=4 : -- cgit v1.2.3 From cd997f938b450010efa93aa8a65ecbed9a68a32e Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 31 Jul 2013 14:04:56 +0200 Subject: include updateVersion in CSS/JS tseed to force reload on update --- inc/template.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index a87650b84..b8129f914 100644 --- a/inc/template.php +++ b/inc/template.php @@ -291,12 +291,10 @@ function tpl_metaheaders($alt = true) { $head = array(); // prepare seed for js and css - $tseed = 0; + $tseed = $updateVersion; $depends = getConfigFiles('main'); - foreach($depends as $f) { - $time = @filemtime($f); - if($time > $tseed) $tseed = $time; - } + foreach($depends as $f) $tseed .= @filemtime($f); + $tseed = md5($tseed); // the usual stuff $head['meta'][] = array('name'=> 'generator', 'content'=> 'DokuWiki'); -- cgit v1.2.3 From b1af90141d42f8844159ff4fad76968a8ee78687 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Thu, 1 Aug 2013 16:32:28 +0200 Subject: Improve nofollow behaviour for ?do=index In response to FS#2766 - make namespace links in the browser sitemap nofollow - remove nofollow from browser sitemap link on the wiki start page when sitemap.xml generation is disabled --- inc/template.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index b8129f914..54407c2ab 100644 --- a/inc/template.php +++ b/inc/template.php @@ -541,6 +541,7 @@ function tpl_actionlink($type, $pre = '', $suf = '', $inner = '', $return = fals * @var string $accesskey * @var string $id * @var string $method + * @var bool $nofollow * @var array $params */ extract($data); @@ -555,10 +556,11 @@ function tpl_actionlink($type, $pre = '', $suf = '', $inner = '', $return = fals $akey = 'accesskey="'.$accesskey.'" '; $addTitle = ' ['.strtoupper($accesskey).']'; } + $rel = $nofollow ? 'rel="nofollow" ' : ''; $out = tpl_link( $linktarget, $pre.(($inner) ? $inner : $caption).$suf, 'class="action '.$type.'" '. - $akey.'rel="nofollow" '. + $akey.$rel. 'title="'.hsc($caption).$addTitle.'"', 1 ); } @@ -595,6 +597,7 @@ function tpl_get_action($type) { global $INFO; global $REV; global $ACT; + global $conf; // check disabled actions and fix the badly named ones if($type == 'history') $type = 'revisions'; @@ -604,6 +607,7 @@ function tpl_get_action($type) { $id = $ID; $method = 'get'; $params = array('do' => $type); + $nofollow = true; switch($type) { case 'edit': // most complicated type - we need to decide on current action @@ -641,6 +645,10 @@ function tpl_get_action($type) { break; case 'index': $accesskey = 'x'; + // allow searchbots to get to the sitemap from the homepage (when dokuwiki isn't providing a sitemap.xml) + if ($conf['start'] == $ID && !$conf['sitemap']) { + $nofollow = false; + } break; case 'top': $accesskey = 't'; @@ -711,7 +719,7 @@ function tpl_get_action($type) { return '[unknown %s type]'; break; } - return compact('accesskey', 'type', 'id', 'method', 'params'); + return compact('accesskey', 'type', 'id', 'method', 'params', 'nofollow'); } /** -- cgit v1.2.3 From 9805efa058358e0fcbd3976fa553901cabe0b2e0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 1 Aug 2013 17:20:25 +0100 Subject: added aria roles to search and acl manager --- inc/template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index a87650b84..0f2144275 100644 --- a/inc/template.php +++ b/inc/template.php @@ -766,7 +766,7 @@ function tpl_searchform($ajax = true, $autocomplete = true) { // don't print the search form if search action has been disabled if(!actionOK('search')) return false; - print '
'; + print '
'; print ''; print ' Date: Thu, 1 Aug 2013 18:54:02 +0100 Subject: improved coding style on tpl_classes() --- inc/template.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index 087e2f9df..6566df7ad 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1759,8 +1759,8 @@ function tpl_classes() { 'dokuwiki', 'mode_'.$ACT, 'tpl_'.$conf['template'], - ($_SERVER['REMOTE_USER']) ? 'loggedIn' : '', - ($INFO['exists']) ? '' : 'notFound', + $_SERVER['REMOTE_USER'] ? 'loggedIn' : '', + $INFO['exists'] ? '' : 'notFound', ($ID == $conf['start']) ? 'home' : '', ); return join(' ', $classes); -- cgit v1.2.3 From e8ec13b9a448dc4c0be4aa459d1586165aed6044 Mon Sep 17 00:00:00 2001 From: Klap-in Date: Fri, 2 Aug 2013 13:38:31 +0200 Subject: localized texts for templates --- inc/template.php | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index bb5f2cd53..33b886927 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1192,6 +1192,39 @@ function tpl_getLang($id) { return $lang[$id]; } +/** + * locale_xhtml($id) + * + * retrieve a language dependent file and pass to xhtml renderer for display + * template equivalent of p_locale_xhtml() + * + * @param string $id id of language dependent wiki page + * @return string parsed contents of the wiki page in xhtml format + */ +function tpl_locale_xhtml($id) { + return p_cached_output(tpl_localFN($id)); +} + +/** + * localFN($id) + * + * prepends appropriate path for a language dependent filename + * template equivalent of localFN() + */ +function tpl_localFN($id) { + $path = tpl_incdir().'lang/'; + global $conf; + $file = DOKU_CONF.'/template_lang/'.$conf['template'].'/'.$conf['lang'].'/'.$id.'.txt'; + if (!@file_exists($file)){ + $file = $path.$conf['lang'].'/'.$id.'.txt'; + if(!@file_exists($file)){ + //fall back to english + $file = $path.'en/'.$id.'.txt'; + } + } + return $file; +} + /** * prints the "main content" in the mediamanger popup * -- cgit v1.2.3 From d317fb5d70f8903dc518943c731202869d450d68 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 2 Aug 2013 14:04:04 +0100 Subject: fixed some bi-directionality issues Fixed some issues which occur whenever RTL and LTR languages could potentially be mixed, using the HTML5 `` element. This element is currently only supported by Chrome and Firefox. The old and only partially working fix for tpl_breadcrumbs() was removed in favour of this solution. --- inc/template.php | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index bb5f2cd53..d03d3561b 100644 --- a/inc/template.php +++ b/inc/template.php @@ -468,7 +468,7 @@ function tpl_link($url, $name, $more = '', $return = false) { * @author Andreas Gohr */ function tpl_pagelink($id, $name = null) { - print html_wikilink($id, $name); + print ''.html_wikilink($id, $name).''; return true; } @@ -800,13 +800,7 @@ function tpl_breadcrumbs($sep = '•') { $crumbs = breadcrumbs(); //setup crumb trace - //reverse crumborder in right-to-left mode, add RLM character to fix heb/eng display mixups - if($lang['direction'] == 'rtl') { - $crumbs = array_reverse($crumbs, true); - $crumbs_sep = ' ‏'.$sep.'‏ '; - } else { - $crumbs_sep = ' '.$sep.' '; - } + $crumbs_sep = ' '.$sep.' '; //render crumbs, highlight the last one print ''.$lang['breadcrumb'].':'; @@ -816,7 +810,9 @@ function tpl_breadcrumbs($sep = '•') { $i++; echo $crumbs_sep; if($i == $last) print ''; + print ''; tpl_link(wl($id), hsc($name), 'class="breadcrumbs" title="'.$id.'"'); + print ''; if($i == $last) print ''; } return true; @@ -889,7 +885,7 @@ function tpl_userinfo() { global $lang; global $INFO; if(isset($_SERVER['REMOTE_USER'])) { - print $lang['loggedinas'].': '.hsc($INFO['userinfo']['name']).' ('.hsc($_SERVER['REMOTE_USER']).')'; + print $lang['loggedinas'].': '.hsc($INFO['userinfo']['name']).' ('.hsc($_SERVER['REMOTE_USER']).')'; return true; } return false; @@ -928,14 +924,14 @@ function tpl_pageinfo($ret = false) { // print it if($INFO['exists']) { $out = ''; - $out .= $fn; + $out .= ''.$fn.''; $out .= ' · '; $out .= $lang['lastmod']; $out .= ': '; $out .= $date; if($INFO['editor']) { $out .= ' '.$lang['by'].' '; - $out .= editorinfo($INFO['editor']); + $out .= ''.editorinfo($INFO['editor']).''; } else { $out .= ' ('.$lang['external_edit'].')'; } @@ -943,7 +939,7 @@ function tpl_pageinfo($ret = false) { $out .= ' · '; $out .= $lang['lockedby']; $out .= ': '; - $out .= editorinfo($INFO['locked']); + $out .= ''.editorinfo($INFO['locked']).''; } if($ret) { return $out; @@ -1469,8 +1465,8 @@ function tpl_license($img = 'badge', $imgonly = false, $return = false, $wrap = } if(!$imgonly) { $out .= $lang['license'].' '; - $out .= ''; + $out .= ''; } if($wrap) $out .= '
'; -- cgit v1.2.3 From c5c17fdaa1af326a3f0c68695cb93575a3af2e5e Mon Sep 17 00:00:00 2001 From: Klap-in Date: Fri, 2 Aug 2013 19:06:29 +0200 Subject: improve method name and phpdocs --- inc/template.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index 33b886927..6af0535c9 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1193,25 +1193,20 @@ function tpl_getLang($id) { } /** - * locale_xhtml($id) - * - * retrieve a language dependent file and pass to xhtml renderer for display + * Retrieve a language dependent file and pass to xhtml renderer for display * template equivalent of p_locale_xhtml() * * @param string $id id of language dependent wiki page * @return string parsed contents of the wiki page in xhtml format */ function tpl_locale_xhtml($id) { - return p_cached_output(tpl_localFN($id)); + return p_cached_output(tpl_localeFN($id)); } /** - * localFN($id) - * - * prepends appropriate path for a language dependent filename - * template equivalent of localFN() + * Prepends appropriate path for a language dependent filename */ -function tpl_localFN($id) { +function tpl_localeFN($id) { $path = tpl_incdir().'lang/'; global $conf; $file = DOKU_CONF.'/template_lang/'.$conf['template'].'/'.$conf['lang'].'/'.$id.'.txt'; -- cgit v1.2.3 From afb2c08218345dc3604024c829a5c408e3f39277 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 3 Aug 2013 14:42:05 +0200 Subject: allow for a style.ini in conf//style.ini This is another go at what pull request #227 tried to do. This removes support for a style.local.ini in the template file in preference of a style.ini in the conf folder --- inc/template.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index ca1c8d9d5..f6eb488f5 100644 --- a/inc/template.php +++ b/inc/template.php @@ -33,11 +33,13 @@ function template($file) { * This replaces the deprecated DOKU_TPLINC constant * * @author Andreas Gohr + * @param string $tpl The template to use, default to current one * @return string */ -function tpl_incdir() { +function tpl_incdir($tpl='') { global $conf; - return DOKU_INC.'lib/tpl/'.$conf['template'].'/'; + if(!$tpl) $tpl = $conf['template']; + return DOKU_INC.'lib/tpl/'.$tpl.'/'; } /** @@ -46,10 +48,12 @@ function tpl_incdir() { * This replaces the deprecated DOKU_TPL constant * * @author Andreas Gohr + * @param string $tpl The template to use, default to current one * @return string */ -function tpl_basedir() { +function tpl_basedir($tpl) { global $conf; + if(!$tpl) $tpl = $conf['template']; return DOKU_BASE.'lib/tpl/'.$conf['template'].'/'; } -- cgit v1.2.3 From 00e3e3940de140e6fe6ce3c558c71a47f676b456 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 3 Aug 2013 17:17:58 +0200 Subject: fix the default ordering of media files to be "natural". also allow the order to be specified in more places. --- inc/template.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index ca1c8d9d5..c8520dc26 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1229,7 +1229,7 @@ function tpl_localeFN($id) { * @param bool $fromajax - set true when calling this function via ajax * @author Andreas Gohr */ -function tpl_mediaContent($fromajax = false) { +function tpl_mediaContent($fromajax = false, $sort='natural') { global $IMG; global $AUTH; global $INUSE; @@ -1259,7 +1259,7 @@ function tpl_mediaContent($fromajax = false) { if($do == 'filesinuse') { media_filesinuse($INUSE, $IMG); } elseif($do == 'filelist') { - media_filelist($NS, $AUTH, $JUMPTO); + media_filelist($NS, $AUTH, $JUMPTO,false,$sort); } elseif($do == 'searchlist') { media_searchlist($INPUT->str('q'), $NS, $AUTH); } else { -- cgit v1.2.3 From 99dca51357b98d8450d43d66b5596504722809c0 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 3 Aug 2013 23:34:20 +0200 Subject: added missing default --- inc/template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index f6eb488f5..ea73b01b6 100644 --- a/inc/template.php +++ b/inc/template.php @@ -51,7 +51,7 @@ function tpl_incdir($tpl='') { * @param string $tpl The template to use, default to current one * @return string */ -function tpl_basedir($tpl) { +function tpl_basedir($tpl='') { global $conf; if(!$tpl) $tpl = $conf['template']; return DOKU_BASE.'lib/tpl/'.$conf['template'].'/'; -- cgit v1.2.3 From dcd4911e24c6e01c3b83310ecf90ee7c01ed7ad4 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Tue, 17 Sep 2013 16:45:51 +0200 Subject: Fix tpl_basedir to use the supplied template Previously only the path for the configured template was returned and the parameter was ignored. --- inc/template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index 8f41ce65b..6eadd37e6 100644 --- a/inc/template.php +++ b/inc/template.php @@ -54,7 +54,7 @@ function tpl_incdir($tpl='') { function tpl_basedir($tpl='') { global $conf; if(!$tpl) $tpl = $conf['template']; - return DOKU_BASE.'lib/tpl/'.$conf['template'].'/'; + return DOKU_BASE.'lib/tpl/'.$tpl.'/'; } /** -- cgit v1.2.3 From 9c438d6c2f958e38aa324a04ed37b9a072872038 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Tue, 17 Sep 2013 16:46:45 +0200 Subject: Fix the js and css cache seed to contain the update version --- inc/template.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index 6eadd37e6..c08767e52 100644 --- a/inc/template.php +++ b/inc/template.php @@ -290,6 +290,7 @@ function tpl_metaheaders($alt = true) { global $QUERY; global $lang; global $conf; + global $updateVersion; // prepare the head array $head = array(); -- cgit v1.2.3 From a04f2bd5a2eae55dbbdbbcffbe7b500b689138e7 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 15 Oct 2013 16:08:45 +0200 Subject: not assign object from plugin_load by reference --- inc/template.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index c08767e52..868ef300c 100644 --- a/inc/template.php +++ b/inc/template.php @@ -223,7 +223,7 @@ function tpl_toc($return = false) { if(in_array($class, $pluginlist)) { // attempt to load the plugin /** @var $plugin DokuWiki_Admin_Plugin */ - $plugin =& plugin_load('admin', $class); + $plugin = plugin_load('admin', $class); } } if( ($plugin !== null) && (!$plugin->forAdminOnly() || $INFO['isadmin']) ) { @@ -257,7 +257,7 @@ function tpl_admin() { if(in_array($class, $pluginlist)) { // attempt to load the plugin /** @var $plugin DokuWiki_Admin_Plugin */ - $plugin =& plugin_load('admin', $class); + $plugin = plugin_load('admin', $class); } } -- cgit v1.2.3 From 443e135d59e9d227eec818dabf9ee64d7a73d474 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 16 Oct 2013 22:04:01 +0100 Subject: replace boolean conditional checks on possibly uninitialized vars with \!empty/empty/isset as appropriate --- inc/template.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index 868ef300c..b42c9d934 100644 --- a/inc/template.php +++ b/inc/template.php @@ -401,7 +401,7 @@ function tpl_metaheaders($alt = true) { // make $INFO and other vars available to JavaScripts $json = new JSON(); $script = "var NS='".$INFO['namespace']."';"; - if($conf['useacl'] && $_SERVER['REMOTE_USER']) { + if($conf['useacl'] && !empty($_SERVER['REMOTE_USER'])) { $script .= "var SIG='".toolbar_signature()."';"; } $script .= 'var JSINFO = '.$json->encode($JSINFO).';'; @@ -680,12 +680,12 @@ function tpl_get_action($type) { } break; case 'register': - if($_SERVER['REMOTE_USER']) { + if(!empty($_SERVER['REMOTE_USER'])) { return false; } break; case 'resendpwd': - if($_SERVER['REMOTE_USER']) { + if(!empty($_SERVER['REMOTE_USER'])) { return false; } break; @@ -1412,7 +1412,7 @@ function tpl_actiondropdown($empty = '', $button = '>') { echo '
'; echo ''; if($REV) echo ''; - if ($_SERVER['REMOTE_USER']) { + if (!empty($_SERVER['REMOTE_USER'])) { echo ''; } @@ -1794,7 +1794,7 @@ function tpl_classes() { 'dokuwiki', 'mode_'.$ACT, 'tpl_'.$conf['template'], - $_SERVER['REMOTE_USER'] ? 'loggedIn' : '', + !empty($_SERVER['REMOTE_USER']) ? 'loggedIn' : '', $INFO['exists'] ? '' : 'notFound', ($ID == $conf['start']) ? 'home' : '', ); -- cgit v1.2.3 From 4c4b65c86f4906b0cdd7b3115636ec829bb7099f Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sun, 20 Oct 2013 22:04:48 +0200 Subject: Fix handling of the legacy subscription action name --- inc/template.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index b42c9d934..e967bf27d 100644 --- a/inc/template.php +++ b/inc/template.php @@ -606,6 +606,7 @@ function tpl_get_action($type) { // check disabled actions and fix the badly named ones if($type == 'history') $type = 'revisions'; + if ($type == 'subscription') $type = 'subscribe'; if(!actionOK($type)) return false; $accesskey = null; @@ -701,10 +702,6 @@ function tpl_get_action($type) { $params['rev'] = $REV; $params['sectok'] = getSecurityToken(); break; - /** @noinspection PhpMissingBreakStatementInspection */ - case 'subscription': - $type = 'subscribe'; - $params['do'] = 'subscribe'; case 'subscribe': if(!$_SERVER['REMOTE_USER']) { return false; -- cgit v1.2.3 From a1288caece2153c08e04252643c89815c1be2a66 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 31 Oct 2013 23:56:08 +0100 Subject: localize some meta header titels. Fixes FS#2409 --- inc/template.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index e967bf27d..41f398016 100644 --- a/inc/template.php +++ b/inc/template.php @@ -318,11 +318,11 @@ function tpl_metaheaders($alt = true) { if($alt) { $head['link'][] = array( 'rel' => 'alternate', 'type'=> 'application/rss+xml', - 'title'=> 'Recent Changes', 'href'=> DOKU_BASE.'feed.php' + 'title'=> $lang['btn_recent'], 'href'=> DOKU_BASE.'feed.php' ); $head['link'][] = array( 'rel' => 'alternate', 'type'=> 'application/rss+xml', - 'title'=> 'Current Namespace', + 'title'=> $lang['currentns'], 'href' => DOKU_BASE.'feed.php?mode=list&ns='.$INFO['namespace'] ); if(($ACT == 'show' || $ACT == 'search') && $INFO['writable']) { @@ -336,21 +336,21 @@ function tpl_metaheaders($alt = true) { if($ACT == 'search') { $head['link'][] = array( 'rel' => 'alternate', 'type'=> 'application/rss+xml', - 'title'=> 'Search Result', + 'title'=> $lang['searchresult'], 'href' => DOKU_BASE.'feed.php?mode=search&q='.$QUERY ); } if(actionOK('export_xhtml')) { $head['link'][] = array( - 'rel' => 'alternate', 'type'=> 'text/html', 'title'=> 'Plain HTML', + 'rel' => 'alternate', 'type'=> 'text/html', 'title'=> $lang['plainhtml'], 'href'=> exportlink($ID, 'xhtml', '', false, '&') ); } if(actionOK('export_raw')) { $head['link'][] = array( - 'rel' => 'alternate', 'type'=> 'text/plain', 'title'=> 'Wiki Markup', + 'rel' => 'alternate', 'type'=> 'text/plain', 'title'=> $lang['wikimarkup'], 'href'=> exportlink($ID, 'raw', '', false, '&') ); } -- cgit v1.2.3 From 0045ec49e6995048e7a0057ebd33d4373bf56239 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 4 Nov 2013 01:22:10 +0000 Subject: removed deprecated tpl_getFavicon() --- inc/template.php | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index 41f398016..60e178d1a 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1693,18 +1693,6 @@ function tpl_includeFile($file) { } } -/** - * Returns icon from data/media root directory if it exists, otherwise - * the one in the template's image directory. - * - * @deprecated Use tpl_getMediaFile() instead - * @author Anika Henke - */ -function tpl_getFavicon($abs = false, $fileName = 'favicon.ico') { - $look = array(":wiki:$fileName", ":$fileName", "images/$fileName"); - return tpl_getMediaFile($look, $abs); -} - /** * Returns tag for various icon types (favicon|mobile|generic) * -- cgit v1.2.3