svnno****@sourc*****
svnno****@sourc*****
2010年 8月 31日 (火) 22:53:58 JST
Revision: 890
http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=890
Author: rsk
Date: 2010-08-31 22:53:58 +0900 (Tue, 31 Aug 2010)
Log Message:
-----------
expack:
- rev.100831.2300.
- unpushæ°ã®ä¿®æ£ã‚’マージ。
-- http://github.com/unpush/p2-php/commit/c0f2309
レスフィルタã®è¡¨ç¤ºãŒãŠã‹ã—ã‹ã£ãŸã®ã‚’ä¿®æ£
-- http://github.com/unpush/p2-php/commit/c777a4f
IDãƒãƒƒãƒ—アップを表示ã—ãŸæ™‚ã«ãƒ•ã‚£ãƒ«ã‚¿è¨å®šãŒä¿å˜ã•ã‚Œãªã„よã†ã«
Modified Paths:
--------------
p2ex/trunk/conf/conf.inc.php
p2ex/trunk/lib/ShowThread.php
p2ex/trunk/read.php
-------------- next part --------------
Modified: p2ex/trunk/conf/conf.inc.php
===================================================================
--- p2ex/trunk/conf/conf.inc.php 2010-08-18 17:50:22 UTC (rev 889)
+++ p2ex/trunk/conf/conf.inc.php 2010-08-31 13:53:58 UTC (rev 890)
@@ -7,7 +7,7 @@
// ƒo[ƒWƒ‡ƒ“î•ñ
$_conf = array(
'p2version' => '1.7.29+1.8.x', // rep2‚̃o[ƒWƒ‡ƒ“
- 'p2expack' => '100817.2020', // Šg’£ƒpƒbƒN‚̃o[ƒWƒ‡ƒ“
+ 'p2expack' => '100831.2300', // Šg’£ƒpƒbƒN‚̃o[ƒWƒ‡ƒ“
'p2name' => 'expack', // rep2‚Ì–¼‘O
);
Modified: p2ex/trunk/lib/ShowThread.php
===================================================================
--- p2ex/trunk/lib/ShowThread.php 2010-08-18 17:50:22 UTC (rev 889)
+++ p2ex/trunk/lib/ShowThread.php 2010-08-31 13:53:58 UTC (rev 890)
@@ -360,10 +360,13 @@
}
foreach ($datlines as $i => $ares) {
- if (($i === 0 && !$nofirst) || $ares === null) {
+ if ($ares === null) {
continue;
}
$n++;
+ if ($i === 0 && !$nofirst) {
+ continue;
+ }
if ($n < $start) {
continue;
}
Modified: p2ex/trunk/read.php
===================================================================
--- p2ex/trunk/read.php 2010-08-18 17:50:22 UTC (rev 889)
+++ p2ex/trunk/read.php 2010-08-31 13:53:58 UTC (rev 890)
@@ -47,7 +47,7 @@
$page = isset($_REQUEST['page']) ? $_REQUEST['page'] : 1;
$resFilter->setRange($_conf['mobile.rnum_range'], $page);
}
- if (empty($popup_filter)) {
+ if (empty($popup_filter) && isset($_REQUEST['submit_filter'])) {
$resFilter->save();
}
}