Skip to content

Commit

Permalink
Merge branch 'master' of github.com:WoltLab/WCF
Browse files Browse the repository at this point in the history
  • Loading branch information
BurntimeX committed Feb 27, 2012
2 parents af31913 + ebf89e5 commit 0fa279d
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 5 deletions.
2 changes: 1 addition & 1 deletion wcfsetup/install/files/acp/style/wcf.css
Expand Up @@ -3923,14 +3923,14 @@ button:hover {
/* Active State */

.wcf-button:focus,
.active .wcf-button,
.default .wcf-button:focus,
input[type='reset']:focus,
input[type='submit']:focus,
input[type='button']:focus,
button:focus,

.wcf-button:active,
.active .wcf-button,
.default .wcf-button:active,
input[type='reset']:active,
input[type='submit']:active,
Expand Down
30 changes: 30 additions & 0 deletions wcfsetup/install/files/icon/bookmark1.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion wcfsetup/install/files/js/WCF.js
Expand Up @@ -2872,7 +2872,7 @@ WCF.Effect.SmoothScroll.prototype = {
* Initializes effect.
*/
init: function() {
$('a[href=#top],a[href=#bottom]').click(function() {
$('a[href$=#top],a[href$=#bottom]').click(function() {
var $target = $(this.hash);
if ($target.length) {
var $targetOffset = $target.getOffsets().top;
Expand Down
22 changes: 19 additions & 3 deletions wcfsetup/install/files/lib/system/io/Tar.class.php
Expand Up @@ -269,15 +269,31 @@ protected function readContent() {
$i = 0;

// Read the 512 bytes header
$longFilename = null;
while (strlen($binaryData = $this->file->read(512)) != 0) {
// read header
$header = $this->readHeader($binaryData);
if ($header === false) {
continue;
}
$this->contentList[$i] = $header;
$this->contentList[$i]['index'] = $i;
$i++;

// fixes a bug that files with long names aren't correctly
// extracted
if ($longFilename !== null) {
$header['filename'] = $longFilename;
$longFilename = null;
}
if ($header['typeflag'] == 'L') {
$fileData = unpack("a".$header['size']."filename", $this->file->read(512));
$longFilename = $fileData['filename'];
$header['size'] = 0;
}
// don't include the @LongLink file in the content list
else {
$this->contentList[$i] = $header;
$this->contentList[$i]['index'] = $i;
$i++;
}

$this->file->seek($this->file->tell() + (512 * ceil(($header['size'] / 512))));
}
Expand Down

0 comments on commit 0fa279d

Please sign in to comment.