Merge branch 'master' into stable

* master: (54 commits)
  release preparations
  RTL and IE7 fixes for code blocks
  beautified code blocks, also using lighter background colour (FS#2444)
  improved section highlighting styles
  removed unnecessary print styles
  fixed interwiki and filetype styles being included in all css modes
  moved some styles around
  improved tab styles
  fixed typo in style.ini
  Brazilia Portuguese language update
  #2541, alter section highlighting to insert a container into the DOM to hold the elements being highlighted & later remove it
  fixed lib/tpl/index.php to reflect recent changes
  changed local style.ini to be merged with standard one
  removed template dependencies from underscored CSS files in new default template
  fixed 2-digit ordered list items in sidebar (FS#2624)
  improved grammar in preview text (FS#2614)
  improvements to h1 in sidebar (follow font size scale + vertical grid)
  adjusted h1 size in sidebar
  fixed warning in popularity plugin FS#2628
  added support for local style.ini files
  ...

1 files changed, 6 insertions, 14 deletions

diff --git a/inc/template.php b/inc/template.php
index 2dc58b36d..d0b1d3e85 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1465,14 +1465,17 @@ function tpl_license($img = 'badge', $imgonly = false, $return = false, $wrap =
 }
 
 /**
- * Includes the rendered XHTML of a given page
+ * Includes the rendered HTML of a given page
  *
  * This function is useful to populate sidebars or similar features in a
  * template
  */
-function tpl_include_page($pageid, $print = true) {
+function tpl_include_page($pageid, $print = true, $propagate = false) {
     global $ID;
     global $TOC;
+
+    if ($propagate) $pageid = page_findnearest($pageid);
+
     $oldid  = $ID;
     $oldtoc = $TOC;
     $html   = p_wiki_xhtml($pageid, '', false);
@@ -1485,17 +1488,6 @@ function tpl_include_page($pageid, $print = true) {
 }
 
 /**
- * Include the sidebar, will check current namespaces first
- */
-function tpl_sidebar($print = true) {
-    global $conf;
-
-    $sidebar = page_findnearest($conf['sidebar']);
-    if($sidebar) return tpl_include_page($sidebar, $print);
-    return '';
-}
-
-/**
  * Display the subscribe form
  *
  * @author Adrian Lang <lang@cosmocode.de>
@@ -1693,7 +1685,7 @@ function tpl_favicon($types = array('favicon')) {
                 $return .= '<link rel="shortcut icon" href="'.tpl_getMediaFile($look).'" />'.NL;
                 break;
             case 'mobile':
-                $look = array(':wiki:apple-touch-icon.png', ':apple-touch-icon.png', 'images/apple-touch-icon.ico');
+                $look = array(':wiki:apple-touch-icon.png', ':apple-touch-icon.png', 'images/apple-touch-icon.png');
                 $return .= '<link rel="apple-touch-icon" href="'.tpl_getMediaFile($look).'" />'.NL;
                 break;
             case 'generic':