Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

複合演算子に置き換え #40

Merged
merged 1 commit into from Apr 29, 2016
Merged

複合演算子に置き換え #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion wiki-common/lib/PukiWiki/Lang/Holiday/PublicHoliday.php
View file
Open in desktop
Expand Up @@ -303,7 +303,7 @@ private function date2jd() {
$t = $s / 3600.0;
$t += $i /60.0;
$t += $h;
$t = $t / 24.0;
$t /= 24.0;

$jd += $t;
return( $jd );
Expand Down
2 changes: 1 addition & 1 deletion wiki-common/lib/PukiWiki/Mailer.php
View file
Open in desktop
Expand Up @@ -56,7 +56,7 @@ function notify($subject, $message, $summary = array(), $summary_position = FALS
if ($summary_position) {
$message = join('', $summary) . $_separator . "\n" . $message;
} else {
$message = $message . "\n" . $_separator . join('', $summary);
$message .= "\n" . $_separator . join('', $summary);
}
unset($summary);
}
Expand Down
2 changes: 1 addition & 1 deletion wiki-common/lib/PukiWiki/Spam/SpamPickup.php
View file
Open in desktop
Expand Up @@ -201,7 +201,7 @@ static function uri_pickup_normalize_pathfile(& $pickups)
foreach (array_keys($pickups) as $key) {
$_key = & $pickups[$key];
if (isset($_key['path'], $_key['file'])) {
$_key['path'] = $_key['path'] . $_key['file'];
$_key['path'] .= $_key['file'];
unset($_key['file']);
}
}
Expand Down
2 changes: 1 addition & 1 deletion wiki-common/plugin/attach.inc.php
View file
Open in desktop
Expand Up @@ -493,7 +493,7 @@ function attach_doupload($file, $page, $pass=NULL, $temp)
foreach ($notify_exclude as $exclude) {
$exclude = preg_quote($exclude);
if (substr($exclude, -1) == '.')
$exclude = $exclude . '*';
$exclude .= '*';
if (preg_match('/^' . $exclude . '/', get_remoteip())) {
$notify_exec = FALSE;
break;
Expand Down
4 changes: 2 additions & 2 deletions wiki-common/plugin/attachref.inc.php
View file
Open in desktop
Expand Up @@ -154,7 +154,7 @@ function plugin_attachref_convert()
'refer' => $vars['page'],
'digest' => $digest
));
$ret = $ret.'<a href="'.$btn_url.'" title="'.$f_btn_text.'">'.$btn_text.'</a>';
$ret .= '<a href="'.$btn_url.'" title="'.$f_btn_text.'">'.$btn_text.'</a>';
}
}

Expand Down Expand Up @@ -247,7 +247,7 @@ function plugin_attachref_inline()
'refer' => $vars['page'],
'digest' => $digest
));
$ret = $ret.'<a href="'.$btn_url.'" title="'.$f_btn_text.'"><small><span class="fa fa-paperclip">'.$btn_text.'</span></small></a>';
$ret .= '<a href="'.$btn_url.'" title="'.$f_btn_text.'"><small><span class="fa fa-paperclip">'.$btn_text.'</span></small></a>';
}
}
return $ret;
Expand Down
2 changes: 1 addition & 1 deletion wiki-common/plugin/edit.inc.php
View file
Open in desktop
Expand Up @@ -187,7 +187,7 @@ function plugin_edit_preview()
// Compat: add plugin and adding contents
if (isset($vars['add']) && $vars['add']) {
if (isset($vars['add_top']) && $vars['add_top']) {
$postdata = $postdata . "\n\n" . $wiki->get(true);
$postdata .= "\n\n" . $wiki->get(true);
} else {
$postdata = $wiki->get(true) . "\n\n" . $postdata;
}
Expand Down