Merge branch 'master' into future

* master: (45 commits)
  TarLib code cleanup
  TarLib: fixed appending in non-dynamic mode
  fixed third method of adding files in TarLib
  fix lone zero block in TarLib created archives
  fix use of constructor in TarLib
  Slovak language update
  Korean language update
  Latvian language update
  removed redundant variables in tpl_include_page() (because of 3ff8773b)
  added cut off points for mobile devices as parameters to style.ini
  Corrected typo: ruke -> rule
  Persian language update
  Spanish language update
  russian language update
  Kazach language update
  correctly check hash parameter in media dispatcher FS#2648
  avoid broken browser_uid on IE
  Removed acronyms for "Perl" and "PERL" as Perl is not an acronym. See http://learn.perl.org/faq/perlfaq1.html#Whats-the-difference-between-perl-and-Perl-
  Made striplangs.php executable
  release preparations
  ...

2 files changed, 8 insertions, 8 deletions

diff --git a/_test/tests/inc/tarlib.test.php b/_test/tests/inc/tarlib.test.php
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/_test/tests/inc/tarlib.test.php
diff --git a/_test/tests/inc/template_sidebar.test.php b/_test/tests/inc/template_include_page.test.php
index 56153894a..47d4d46f1 100644
--- a/_test/tests/inc/template_sidebar.test.php
+++ b/_test/tests/inc/template_include_page.test.php
@@ -1,12 +1,12 @@
 <?php
 
-class template_sidebar_test extends DokuWikiTest {
+class template_include_page_test extends DokuWikiTest {
     function testNoSidebar() {
         global $ID;
 
         $ID = 'foo:bar:baz:test';
-        $sidebar = tpl_sidebar(false);
-        $this->assertEquals('',$sidebar);
+        $sidebar = tpl_include_page('sidebar', false, true);
+        $this->assertEquals('', $sidebar);
     }
 
     function testExistingSidebars() {
@@ -15,25 +15,25 @@ class template_sidebar_test extends DokuWikiTest {
         saveWikiText('sidebar', 'topsidebar-test', '');
 
         $ID = 'foo:bar:baz:test';
-        $sidebar = tpl_sidebar(false);
+        $sidebar = tpl_include_page('sidebar', false, true);
         $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0);
 
         $ID = 'foo';
-        $sidebar = tpl_sidebar(false);
+        $sidebar = tpl_include_page('sidebar', false, true);
         $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0);
 
         saveWikiText('foo:bar:sidebar', 'bottomsidebar-test', '');
 
         $ID = 'foo:bar:baz:test';
-        $sidebar = tpl_sidebar(false);
+        $sidebar = tpl_include_page('sidebar', false, true);
         $this->assertTrue(strpos($sidebar, 'bottomsidebar-test') > 0);
 
         $ID = 'foo:bar:test';
-        $sidebar = tpl_sidebar(false);
+        $sidebar = tpl_include_page('sidebar', false, true);
         $this->assertTrue(strpos($sidebar, 'bottomsidebar-test') > 0);
 
         $ID = 'foo';
-        $sidebar = tpl_sidebar(false);
+        $sidebar = tpl_include_page('sidebar', false, true);
         $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0);
     }