MERGE: リビジョン1991。Adminクラスにおける<%skinfile%>の引数を修正

BaseActions::parse_skinfile()はディレクトリ区切り文字を付加しないことを考慮した修正。

Revision 1991:
FIX: the wrong path for <%skinfile%> in Admin class
BaseActions::parse_skinfile() don't add path separator. So <%skinfile%>
needs it.
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1901

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index c72637c..10fe0c6 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -2968,7 +2968,7 @@ class Admin
                
                $member->isAdmin() or self::disallow();
                
-               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/templateEdit.js)%>\"></script>\n";
                self::$extrahead .= "<script type=\"text/javascript\">setTemplateEditText('" . Entity::hsc(_EDITTEMPLATE_EMPTY) . "');</script>\n";
                
                self::$skin->parse('templateedit');
@@ -3252,7 +3252,7 @@ class Admin
                }
                $member->isAdmin() or self::disallow();
                
-               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/templateEdit.js)%>\"></script>\n";
                self::$extrahead .= '<script type="text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . '");</script>' . "\n";
                
                self::$skin->parse('admintemplateedit');