OSDN Git Service
(root)
/
nucleus-jp
/
nucleus-next.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8af280a
)
FIX:ブックマークレット用のメンバー毎のスキンが半円されていなかったのを修正
author
shizuki
<shizuki@kinezumi.net>
Wed, 30 May 2012 00:11:56 +0000
(09:11 +0900)
committer
shizuki
<shizuki@kinezumi.net>
Wed, 30 May 2012 00:11:56 +0000
(09:11 +0900)
FIX:ブックマークレットのスキンエラーの時にヘッダ情報を送信するように修正
nucleus/bookmarklet.php
patch
|
blob
|
history
diff --git
a/nucleus/bookmarklet.php
b/nucleus/bookmarklet.php
index
a7ddd84
..
9ef918f
100644
(file)
--- a/
nucleus/bookmarklet.php
+++ b/
nucleus/bookmarklet.php
@@
-26,11
+26,16
@@
$CONF['UsingAdminArea'] = 1;
include('../config.php');
// get skin object
-$skinid = $
CONF['BookmarkletSkin']
;
+$skinid = $
member->bookmarklet
;
if ( !Skin::existsID($skinid) )
{
- echo _ERROR_SKIN;
- exit;
+ $skinid = $CONF['BookmarkletSkin'];
+ if ( !Skin::existsID($skinid) )
+ {
+ sendContentType('text/html');
+ echo _ERROR_SKIN;
+ exit;
+ }
}
$skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');