codes****@googl*****
codes****@googl*****
2009年 3月 29日 (日) 21:55:52 JST
Author: tacahi
Date: Sun Mar 29 05:53:53 2009
New Revision: 1350
Added:
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black/
- copied from r1344,
/trunk/plugins/mycaljp/public_html/templates/black/
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black/README.txt
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black/README.txt
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black/calendar.thtml
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black/calendar.thtml
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black/day.thtml
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black/day.thtml
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black/header.thtml
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black/header.thtml
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black/mycaljp.css
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black/mycaljp.css
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black/searchblockintro.thtml
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black/searchblockintro.thtml
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black/searchresults.thtml
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black/searchresults.thtml
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black/week.thtml
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black/week.thtml
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black_multi_language/
- copied from r1344,
/trunk/plugins/mycaljp/public_html/templates/black_multi_language/
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black_multi_language/README.txt
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black_multi_language/README.txt
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black_multi_language/calendar.thtml
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black_multi_language/calendar.thtml
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black_multi_language/config.php
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black_multi_language/config.php
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black_multi_language/day.thtml
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black_multi_language/day.thtml
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black_multi_language/header.thtml
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black_multi_language/header.thtml
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black_multi_language/mycaljp.css
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black_multi_language/mycaljp.css
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black_multi_language/searchblockintro.thtml
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black_multi_language/searchblockintro.thtml
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black_multi_language/searchresults.thtml
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black_multi_language/searchresults.thtml
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/templates/black_multi_language/week.thtml
- copied unchanged from r1344,
/trunk/plugins/mycaljp/public_html/templates/black_multi_language/week.thtml
Modified:
branches/geeklog-new-tree/extended/CHANGES.jp
branches/geeklog-new-tree/plugins-jp/mycaljp/README_JP
branches/geeklog-new-tree/plugins-jp/mycaljp/config.php
branches/geeklog-new-tree/plugins-jp/mycaljp/history
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/calsearch.php
branches/geeklog-new-tree/plugins-jp/mycaljp/readme_jp.html
Log:
r1346, r1347の変更をマージしました。
Modified: branches/geeklog-new-tree/extended/CHANGES.jp
==============================================================================
--- branches/geeklog-new-tree/extended/CHANGES.jp (original)
+++ branches/geeklog-new-tree/extended/CHANGES.jp Sun Mar 29 05:53:53 2009
@@ -1,5 +1,12 @@
$Id$
+2009-03-28 Yoshinori Tahara <dengen>
+
+ * mycaljpプラグインをバージョン2.0.6に更新しました。
+ Auge Bangさんが制作された、「mycaljp専用Black Theme」を同梱しました。
+ Geeklog1.5以降で記事のイントロ表示した際に日付が現在の日付になってし
+ まう問題を修正しました。
+
2009-03-21 Takahiro Kambe <tacahi>
* geeklog-1.5.2-jp-extended-1.0をリリースします。
Modified: branches/geeklog-new-tree/plugins-jp/mycaljp/README_JP
==============================================================================
--- branches/geeklog-new-tree/plugins-jp/mycaljp/README_JP (original)
+++ branches/geeklog-new-tree/plugins-jp/mycaljp/README_JP Sun Mar 29
05:53:53 2009
@@ -1,4 +1,4 @@
-mycaljp2.0.0 から mycaljp2.0.5 （本バージョン）にアップデートする方法
+mycaljp2.0.0 から mycaljp2.0.6 （本バージョン）にアップデートする方法
mycaljp2.0.0 にはプラグインバージョンが正常に更新されない問題がありますの
で、
以下の手順に従って、アップデートして下さい。
Modified: branches/geeklog-new-tree/plugins-jp/mycaljp/config.php
==============================================================================
--- branches/geeklog-new-tree/plugins-jp/mycaljp/config.php (original)
+++ branches/geeklog-new-tree/plugins-jp/mycaljp/config.php Sun Mar 29
05:53:53 2009
@@ -47,7 +47,7 @@
// Plugin info
-$_MYCALJP2_CONF['pi_version'] = '2.0.5'; // Plugin Version
+$_MYCALJP2_CONF['pi_version'] = '2.0.6'; // Plugin Version
$_MYCALJP2_CONF['gl_version'] = '1.4.1'; // GL Version plugin for
$_MYCALJP2_CONF['pi_url'] = 'http://www.trybase.com/~dengen/log/';
// Plugin Homepage
Modified: branches/geeklog-new-tree/plugins-jp/mycaljp/history
==============================================================================
--- branches/geeklog-new-tree/plugins-jp/mycaljp/history (original)
+++ branches/geeklog-new-tree/plugins-jp/mycaljp/history Sun Mar 29
05:53:53 2009
@@ -174,4 +174,15 @@
* mycaljp plugin version
2.0.4 *
* 2008.9.17 : Yoshinori Tahara as
dengen *
* Calendarjpに対応し
た． *
+*
*
+* mycaljp plugin version
2.0.5 *
+* 2008.9.26 : Yoshinori Tahara as
dengen *
+* インクルード対策を実施し
た． *
+*
*
+* mycaljp plugin version
2.0.6 *
+* 2009.3.28 : Yoshinori Tahara as
dengen *
+* Auge Bangさんが制作された、「mycaljp専用Black Theme」を同梱し
た． *
+* (Augeさん、どうも有難うございま
す!) *
+* Geeklog1.5以降で記事のイントロ表示した際に日付が現在の日付になってしま
う *
+* 問題を修
正． *
*********************************************************************************/
Modified:
branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/calsearch.php
==============================================================================
--- branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/calsearch.php
(original)
+++ branches/geeklog-new-tree/plugins-jp/mycaljp/public_html/calsearch.php
Sun Mar 29 05:53:53 2009
@@ -431,18 +431,38 @@
}
$msql = array();
- $msql['mysql']="SELECT STRAIGHT_JOIN s.*, UNIX_TIMESTAMP(s.date)
AS day, "
- . $userfields . ", t.topic, t.imageurl "
- . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']}
AS u, "
- . "{$_TABLES['topics']} AS t WHERE (s.uid = u.uid) AND
(s.tid = t.tid) AND "
- . $sql . "ORDER BY date DESC LIMIT $offset, $limit";
- $msql['mssql']="SELECT STRAIGHT_JOIN s.sid, s.uid, s.draft_flag,
s.tid, s.date, s.title, cast(s.introtext as text) as introtext,
cast(s.bodytext as text) as bodytext, s.hits, s.numemails, s.comments,
s.trackbacks, s.related, s.featured, s.show_topic_icon, s.commentcode,
s.trackbackcode, s.statuscode, s.expire, s.postmode, s.frontpage,
s.in_transit, s.owner_id, s.group_id, s.perm_owner, s.perm_group,
s.perm_members, s.perm_anon, s.advanced_editor_mode, "
- . " UNIX_TIMESTAMP(s.date) AS day, "
- . $userfields . ", t.topic, t.imageurl "
- . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']}
AS u, "
- . "{$_TABLES['topics']} AS t WHERE (s.uid = u.uid) AND
(s.tid = t.tid) AND "
- . $sql . "ORDER BY date DESC LIMIT $offset, $limit";
+ if (floatval (VERSION) >= 1.5) { // 2009.03.23 - Supports v1.5 and
upper version.
+
+ $msql['mysql']="SELECT STRAIGHT_JOIN s.*,
UNIX_TIMESTAMP(s.date) AS unixdate, "
+ . 'UNIX_TIMESTAMP(s.expire) as expireunix, '
+ . $userfields . ", t.topic, t.imageurl "
+ . "FROM {$_TABLES['stories']} AS s,
{$_TABLES['users']} AS u, "
+ . "{$_TABLES['topics']} AS t WHERE (s.uid = u.uid)
AND (s.tid = t.tid) AND "
+ . $sql . "ORDER BY featured DESC, date DESC LIMIT
$offset, $limit";
+
+ $msql['mssql']="SELECT STRAIGHT_JOIN s.sid, s.uid,
s.draft_flag, s.tid, s.date, s.title, cast(s.introtext as text) as
introtext, cast(s.bodytext as text) as bodytext, s.hits, s.numemails,
s.comments, s.trackbacks, s.related, s.featured, s.show_topic_icon,
s.commentcode, s.trackbackcode, s.statuscode, s.expire, s.postmode,
s.frontpage, s.in_transit, s.owner_id, s.group_id, s.perm_owner,
s.perm_group, s.perm_members, s.perm_anon, s.advanced_editor_mode, "
+ . " UNIX_TIMESTAMP(s.date) AS unixdate, "
+ . 'UNIX_TIMESTAMP(s.expire) as expireunix, '
+ . $userfields . ", t.topic, t.imageurl "
+ . "FROM {$_TABLES['stories']} AS s,
{$_TABLES['users']} AS u, "
+ . "{$_TABLES['topics']} AS t WHERE (s.uid = u.uid)
AND (s.tid = t.tid) AND "
+ . $sql . "ORDER BY featured DESC, date DESC LIMIT
$offset, $limit";
+ } else {
+
+ $msql['mysql']="SELECT STRAIGHT_JOIN s.*,
UNIX_TIMESTAMP(s.date) AS day, "
+ . $userfields . ", t.topic, t.imageurl "
+ . "FROM {$_TABLES['stories']} AS s,
{$_TABLES['users']} AS u, "
+ . "{$_TABLES['topics']} AS t WHERE (s.uid = u.uid)
AND (s.tid = t.tid) AND "
+ . $sql . "ORDER BY date DESC LIMIT $offset, $limit";
+
+ $msql['mssql']="SELECT STRAIGHT_JOIN s.sid, s.uid,
s.draft_flag, s.tid, s.date, s.title, cast(s.introtext as text) as
introtext, cast(s.bodytext as text) as bodytext, s.hits, s.numemails,
s.comments, s.trackbacks, s.related, s.featured, s.show_topic_icon,
s.commentcode, s.trackbackcode, s.statuscode, s.expire, s.postmode,
s.frontpage, s.in_transit, s.owner_id, s.group_id, s.perm_owner,
s.perm_group, s.perm_members, s.perm_anon, s.advanced_editor_mode, "
+ . " UNIX_TIMESTAMP(s.date) AS day, "
+ . $userfields . ", t.topic, t.imageurl "
+ . "FROM {$_TABLES['stories']} AS s,
{$_TABLES['users']} AS u, "
+ . "{$_TABLES['topics']} AS t WHERE (s.uid = u.uid)
AND (s.tid = t.tid) AND "
+ . $sql . "ORDER BY date DESC LIMIT $offset, $limit";
+ }
$result = DB_query ($msql);
Modified: branches/geeklog-new-tree/plugins-jp/mycaljp/readme_jp.html
==============================================================================
--- branches/geeklog-new-tree/plugins-jp/mycaljp/readme_jp.html (original)
+++ branches/geeklog-new-tree/plugins-jp/mycaljp/readme_jp.html Sun Mar 29
05:53:53 2009
@@ -118,10 +118,10 @@
<h1><a name="_top">Geeklog Mycaljp プラグイン</a></h1>
-<h2>バージョン: 2.0.5</h2>
+<h2>バージョン: 2.0.6</h2>
<h2>作成者: Yoshinori Tahara - dengen</h2>
-<h2>公開日: 2008.9.26</h2>
+<h2>公開日: 2009.3.28</h2>
<h2>ライセンス: GPL</h2>
<h2>概要:</h2>
@@ -414,6 +414,12 @@
<th>バージョン</th>
<th>公開日</th>
<th>説明</th>
+ </tr>
+ <tr>
+ <td class="center">2.0.6</td>
+ <td class="center">2009.3.28</td>
+ <td><span class="new">追加</span> Auge Bangさんが制作された、「
mycaljp専用Black Theme」を同梱しました。(Augeさん、どうも有難うございます!)
<br>
+ <span class="fix">修正</span> Geeklog1.5以降で記事のイントロ表示
した際に日付が現在の日付になってしまう問題を修正しました。</td>
</tr>
<tr>
<td class="center">2.0.5</td>