svnno****@sourc*****
svnno****@sourc*****
2010年 1月 26日 (火) 08:56:28 JST
Revision: 810
http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=810
Author: rsk
Date: 2010-01-26 08:56:27 +0900 (Tue, 26 Jan 2010)
Log Message:
-----------
expack:
- rev.100126.0900.
- ImageCache2ã§ç”»åƒãŒä¿å˜ã•ã‚Œãªããªã£ã¦ã„ãŸä¸å…·åˆã‚’ä¿®æ£ã€‚
Modified Paths:
--------------
p2ex/trunk/conf/conf.inc.php
p2ex/trunk/ic2.php
p2ex/trunk/js/smartpopup.js
-------------- next part --------------
Modified: p2ex/trunk/conf/conf.inc.php
===================================================================
--- p2ex/trunk/conf/conf.inc.php 2010-01-25 17:37:38 UTC (rev 809)
+++ p2ex/trunk/conf/conf.inc.php 2010-01-25 23:56:27 UTC (rev 810)
@@ -7,7 +7,7 @@
// ƒo[ƒWƒ‡ƒ“î•ñ
$_conf = array(
'p2version' => '1.7.29+1.8.x', // rep2‚̃o[ƒWƒ‡ƒ“
- 'p2expack' => '100126.0200', // Šg’£ƒpƒbƒN‚̃o[ƒWƒ‡ƒ“
+ 'p2expack' => '100126.0900', // Šg’£ƒpƒbƒN‚̃o[ƒWƒ‡ƒ“
'p2name' => 'expack', // rep2‚Ì–¼‘O
);
Modified: p2ex/trunk/ic2.php
===================================================================
--- p2ex/trunk/ic2.php 2010-01-25 17:37:38 UTC (rev 809)
+++ p2ex/trunk/ic2.php 2010-01-25 23:56:27 UTC (rev 810)
@@ -622,7 +622,7 @@
} else {
$maxsize = (int)$maxsize;
}
- if (0 < $maxsize) {
+ if (0 < $maxsize && $maxsize < $size) {
$isError = true;
$errmsg = "ƒtƒ@ƒCƒ‹ƒTƒCƒY‚ª‘å‚«‚·‚¬‚Ü‚·B(file:{$size}; max:{$maxsize};)";
}
Modified: p2ex/trunk/js/smartpopup.js
===================================================================
--- p2ex/trunk/js/smartpopup.js 2010-01-25 17:37:38 UTC (rev 809)
+++ p2ex/trunk/js/smartpopup.js 2010-01-25 23:56:27 UTC (rev 810)
@@ -384,7 +384,11 @@
window.top.location.href = inUrl;
break;
default:
- if (window.parent != window.self && typeof window.parent[target] !== 'undefined') {
+ if (window.parent != window.self &&
+ typeof window.parent[target] !== 'undefined' &&
+ typeof window.parent[target].location !== 'undefined' &&
+ typeof window.parent[target].location.href !== 'undefined')
+ {
window.parent[target].location.href = inUrl;
} else {
window.open(inUrl, target, '')