Skip to content

Commit 427f21e

Browse files
committed
Revert PHP > 5.4 syntax
1 parent 9ab3da0 commit 427f21e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

system/application/libraries/File_Upload.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ private function convertPHPSizeToBytes($sSize) { // http://stackoverflow.com/q
105105
private function getMaximumFileUploadSize() { // http://stackoverflow.com/questions/13076480/php-get-actual-maximum-upload-size
106106
$size = min($this->convertPHPSizeToBytes(ini_get('post_max_size')), $this->convertPHPSizeToBytes(ini_get('upload_max_filesize')));
107107
$base = log($size) / log(1024);
108-
$suffix = array("", "k", "M", "G", "T")[floor($base)];
108+
$suffixes = array("", "k", "M", "G", "T");
109+
$suffix = $suffixes[floor($base)];
109110
return pow(1024, $base - floor($base)) . $suffix;
110111
}
111112

system/application/views/modules/cover/login.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
} elseif (!empty($book) && $user_level!='Author') {
2222
// echo '<span class="disabled_link">'.lang('login.manage_content').'</span>'."\n";
2323
} else {
24-
echo '<a href="'.confirm_slash(base_url()).'system/dashboard?book_id='.@$book->book_id.'&zone=style#tabs-style">'.lang('login.manage_content').'</a> | <a href="'.confirm_slash(base_url()).'">'.lang('login.index').'</a>'.' | <a href="http://scalar.usc.edu/works/guide">'.lang('login.guide').'</a>';
24+
echo '<a href="'.confirm_slash(base_url()).'system/dashboard?book_id='.((isset($book->book_id))?$book->book_id:'').'&zone=style#tabs-style">'.lang('login.manage_content').'</a> | <a href="'.confirm_slash(base_url()).'">'.lang('login.index').'</a>'.' | <a href="http://scalar.usc.edu/works/guide">'.lang('login.guide').'</a>';
2525
}
2626
// Not logged in
2727
else:

0 commit comments

Comments
 (0)