UPDATE: update version history and change version to 3.41 RC for testing purposes

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk/utf8@974 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/nucleus/documentation/history.html b/nucleus/documentation/history.html
index 343d58a..cc796b1 100755 (executable)
--- a/nucleus/documentation/history.html
+++ b/nucleus/documentation/history.html
@@ -55,7 +55,7 @@
 \r
 <ul>\r
        <li>\r
-               <strong>Nucleus v3.4 SVN</strong>\r
+               <strong>Nucleus v3.41 RC (March 14, 2009)</strong>\r
                <ul>\r
                        <li>CHANGED: ドキュメントの文字サイズを可変に(jQuery使用)(character size of the document, variably via jQuery.) (shizuki)</li>\r
                        <li>FIXED: (<a href="http://nucleus-jp.sourceforge.jp/tracker/index.php?do=details&amp;task_id=89">#89(JP)</a>): metaWeblog.newPostにおけるコメント可否. (shizuki/NKJG)</li>\r
@@ -64,12 +64,14 @@
                        <li>CHANGED: NP_SkinFilesオプション用言語定義追加(NP_SkinFiles option word update via language file)(shizuki)</li>\r
                        <li>UPDATED: NP_SkinFiles 2.03に差し替え(code:yama/commit:shizuki)(NP_SkinFiles update to 2.03)(code:yama,katsumi/commit:shizuki)</li>\r
                        <li>FIXED: 「General」カテゴリのUPDATE漏れ修正(install.php)(preinstall default category name is not localize)(shizuki)</li>\r
+                       <li>FIXED: Reduce PHP Notices caused by undefined variables and wrong offsets (shizuki, kaigreve)</li>\r
+                       <li>FIXED: additional changes in the language files english.php and english-utf8.php to reflect modifications since version 3.30 (kaigreve)</li>\r
+                       <li>FIXED: SQL error in MEMBER::write() where mautosave not forced to be integer. See <a href="http://forum.nucleuscms.org/viewtopic.php?t=18575">Problem with 3.40</a>. (ftruscot)\r
                        <li>ADDED: debug info in System info to show if $CONF['ItemURL'] is broken in admin panel (admun)</li>\r
                        <li>FIXED: Reorder the setting of config vars ($CONF) to avoid notices (should have no side effects)(kaigreve)</li>\r
                        <li>FIXED: Avoid notices caused by explode because the string '\\' is not a part of the $val and no array is returned(kaigreve)</li>\r
                        <li>FIXED: remove one redundant definition of the constant _MANAGER_PLUGINFILE_NOTFOUND(kaigreve)</li>\r
                        <li>FIXED: bug in showlist.php for displaying plugin dependency. See <a href="http://forum.nucleuscms.org/viewtopic.php?t=18594">Manage Plugins error in Nucleus 3.40</a> (ftruscot, thanks ajmiller)</li>\r
-                       <li>FIXED: SQL error in MEMBER::write() where mautosave not forced to be integer. See <a href="http://forum.nucleuscms.org/viewtopic.php?t=18575">Problem with 3.40</a>. (ftruscot)</li>\r
                        <li>CHANGED: Modify Fix SQL error when new blog add by shizuki, to give a default english value for category name, category desc, first item title, and first item body in case where user does not have updated language file. (ftruscot)</li>\r
                        <li>FIXED: Fix SQL Error when new blog add. (shizuki)</li>\r
                        <li>CHANGED: Mod Change link URI of 'help icon' to full URI (documentation/help.html to $CONF['AdminURL'].'documentation/help.html') (shizuki)</li>\r

diff --git a/nucleus/libs/BLOG.php b/nucleus/libs/BLOG.php
index 6948fe9..716bd53 100755 (executable)
--- a/nucleus/libs/BLOG.php
+++ b/nucleus/libs/BLOG.php
@@ -553,7 +553,10 @@ class BLOG {
        function showArchiveList($template, $mode = 'month', $limit = 0) {
                global $CONF, $catid, $manager;
 
+               if (!isset ($linkparams)) {
                $linkparams = array();
+               }
+
                if ($catid) {
                        $linkparams = array('catid' => $catid);
                }

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index 10d75d6..71c2a05 100755 (executable)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -20,7 +20,7 @@
 // needed if we include globalfunctions from install.php\r
 global $nucleus, $CONF, $DIR_LIBS, $DIR_LANG, $manager, $member;\r
 \r
-$nucleus['version'] = 'v3.40RC';\r
+$nucleus['version'] = 'v3.41RC';\r
 $nucleus['codename'] = '';\r
 \r
 checkVars(array('nucleus', 'CONF', 'DIR_LIBS', 'MYSQL_HOST', 'MYSQL_USER', 'MYSQL_PASSWORD', 'MYSQL_DATABASE', 'DIR_LANG', 'DIR_PLUGINS', 'HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_ENV_VARS', 'HTTP_SESSION_VARS', 'HTTP_POST_FILES', 'HTTP_SERVER_VARS', 'GLOBALS', 'argv', 'argc', '_GET', '_POST', '_COOKIE', '_ENV', '_SESSION', '_SERVER', '_FILES'));\r
@@ -497,7 +497,7 @@ function intCookieVar($name) {
   * returns the currently used version (100 = 1.00, 101 = 1.01, etc...)\r
   */\r
 function getNucleusVersion() {\r
-       return 340;\r
+       return 341;\r
 }\r
 \r
 /**\r
@@ -1117,8 +1117,10 @@ function shorten($text, $maxlength, $toadd) {
        $text  = strtr($text, $trans);\r
 \r
        // 2. the actual shortening\r
-       if (strlen($text) > $maxlength)\r
-               $text = mb_strimwidth($text, 0, $maxlength, $toadd, _CHARSET);\r
+       if (strlen($text) > $maxlength) {\r
+//             $text = substr($text, 0, $maxlength - strlen($toadd) ) . $toadd;\r
+               $text = mb_strimwidth($text, 0, $maxlength, $toadd, _CHARSET); // for Japanese\r
+       }\r
        return $text;\r
 }\r
 \r
@@ -2054,15 +2056,16 @@ function _links_list() {
  * @todo document this\r
  */\r
 function encode_desc(&$data)\r
-    {   //_$to_entities = get_html_translation_table(HTML_ENTITIES);\r
-        $to_entities = get_html_translation_table(HTML_SPECIALCHARS);\r
-        $from_entities = array_flip($to_entities);\r
-        $data = str_replace('<br />', '\n', $data); //hack\r
-        $data = strtr($data,$from_entities);\r
-        $data = strtr($data,$to_entities);\r
-        $data = str_replace('\n', '<br />', $data); //hack\r
-        return $data;\r
-    }\r
+{\r
+//     _$to_entities = get_html_translation_table(HTML_ENTITIES);\r
+       $to_entities = get_html_translation_table(HTML_SPECIALCHARS); // for Japanese\r
+       $from_entities = array_flip($to_entities);\r
+       $data = str_replace('<br />', '\n', $data); //hack\r
+       $data = strtr($data,$from_entities);\r
+       $data = strtr($data,$to_entities);\r
+       $data = str_replace('\n', '<br />', $data); //hack\r
+       return $data;\r
+}\r
 \r
 /**\r
  * Returns the Javascript code for a bookmarklet that works on most modern browsers\r