Merge branch 'master' into proxyconnect

* master: (169 commits)
  added PCRE UTF-8 checks to do=check FS#2636
  avoid multiple paralell update checks
  fix regression bug in HTTPClient FS#2621
  changed PAGEUTILS_ID_HIDEPAGE to has BEFORE/AFTER
  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
  added event PAGEUTILS_ID_HIDEPAGE
  added test for isHiddenPage()
  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
  ...

1 files changed, 6 insertions, 5 deletions

diff --git a/inc/io.php b/inc/io.php
index 4c6eb97df..b4da7d635 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -18,8 +18,8 @@ if(!defined('DOKU_INC')) die('meh.');
  *
  * @todo use safemode hack
  * @param string $id      - a pageid, the namespace of that id will be tried to deleted
- * @param string $basadir - the config name of the type to delete (datadir or mediadir usally)
- * @returns bool - true if at least one namespace was deleted
+ * @param string $basedir - the config name of the type to delete (datadir or mediadir usally)
+ * @return bool - true if at least one namespace was deleted
  * @author  Andreas Gohr <andi@splitbrain.org>
  * @author Ben Coburn <btcoburn@silicodon.net>
  */
@@ -113,6 +113,7 @@ function io_readFile($file,$clean=true){
 
 function bzfile($file){
     $bz = bzopen($file,"r");
+    $str = '';
     while (!feof($bz)){
         //8192 seems to be the maximum buffersize?
         $str = $str . bzread($bz,8192);
@@ -477,8 +478,8 @@ function io_download($url,$file,$useAttachment=false,$defaultName='',$maxSize=20
     $data = $http->get($url);
     if(!$data) return false;
 
+    $name = '';
     if ($useAttachment) {
-        $name = '';
         if (isset($http->resp_headers['content-disposition'])) {
             $content_disposition = $http->resp_headers['content-disposition'];
             $match=array();
@@ -578,8 +579,8 @@ function io_exec($cmd, $input, &$output){
  * @param  string $file    The file to search
  * @param  string $pattern PCRE pattern
  * @param  int    $max     How many lines to return (0 for all)
- * @param  bool   $baxkref When true returns array with backreferences instead of lines
- * @return matching lines or backref, false on error
+ * @param  bool   $backref When true returns array with backreferences instead of lines
+ * @return array matching lines or backref, false on error
  */
 function io_grep($file,$pattern,$max=0,$backref=false){
     $fh = @fopen($file,'r');