3.65sp1リリースのための修正

[nucleus-jp/nucleus-jp-ancient.git] / nucleus / libs / globalfunctions.php

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index 9da29bc..09a2e29 100755 (executable)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -2,7 +2,7 @@
 \r
 /*\r
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
- * Copyright (C) 2002-2011 The Nucleus Group\r
+ * Copyright (C) 2002-2013 The Nucleus Group\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -10,17 +10,11 @@
  * of the License, or (at your option) any later version.\r
  * (see nucleus/documentation/index.html#license for more info)\r
  */\r
-/**\r
- * @license http://nucleuscms.org/license.txt GNU General Public License\r
- * @copyright Copyright (C) 2002-2011 The Nucleus Group\r
- * @version $Id$\r
- * $NucleusJP: globalfunctions.php,v 1.23.2.7 2008/02/05 08:30:08 kimitake Exp $\r
- */\r
 \r
 // needed if we include globalfunctions from install.php\r
 global $nucleus, $CONF, $DIR_LIBS, $DIR_LANG, $manager, $member;\r
 \r
-$nucleus['version'] = 'v3.65';\r
+$nucleus['version'] = 'v3.65sp1';\r
 $nucleus['codename'] = '';\r
 \r
 // check and die if someone is trying to override internal globals (when register_globals turn on)\r
@@ -599,7 +593,7 @@ function intCookieVar($name) {
   * returns the currently used version (100 = 1.00, 101 = 1.01, etc...)\r
   */\r
 function getNucleusVersion() {\r
-       return 364;\r
+       return 365;\r
 }\r
 \r
 /**\r
@@ -882,7 +876,7 @@ function getCatIDFromName($name) {
 function quickQuery($q) {\r
        $res = sql_query($q);\r
        $obj = sql_fetch_object($res);\r
-       return $obj->result;\r
+       return is_object($obj) ? $obj->result : NULL;\r
 }\r
 \r
 function getPluginNameFromPid($pid) {\r
@@ -1552,7 +1546,7 @@ function createBlogidLink($blogid, $params = '') {
        return createLink('blog', array('blogid' => $blogid, 'extra' => $params) );\r
 }\r
 \r
-function createLink($type, $args) {\r
+function createLink($type, $params) {\r
        global $manager, $CONF;\r
 \r
        $generatedURL = '';\r
@@ -1564,7 +1558,7 @@ function createLink($type, $args) {
        if ($usePathInfo) {\r
                $param = array(\r
                        'type'          =>  $type,\r
-                       'args'          =>  $args,\r
+                       'params'        =>  $params,\r
                        'completed'     => &$created,\r
                        'url'           => &$url\r
                );\r
@@ -1580,58 +1574,58 @@ function createLink($type, $args) {
        switch ($type) {\r
                case 'item':\r
                        if ($usePathInfo) {\r
-                               $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $args['itemid'];\r
+                               $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $params['itemid'];\r
                        } else {\r
-                               $url = $CONF['ItemURL'] . '?itemid=' . $args['itemid'];\r
+                               $url = $CONF['ItemURL'] . '?itemid=' . $params['itemid'];\r
                        }\r
                        break;\r
 \r
                case 'member':\r
                        if ($usePathInfo) {\r
-                               $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $args['memberid'];\r
+                               $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $params['memberid'];\r
                        } else {\r
-                               $url = $CONF['MemberURL'] . '?memberid=' . $args['memberid'];\r
+                               $url = $CONF['MemberURL'] . '?memberid=' . $params['memberid'];\r
                        }\r
                        break;\r
 \r
                case 'category':\r
                        if ($usePathInfo) {\r
-                               $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $args['catid'];\r
+                               $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $params['catid'];\r
                        } else {\r
-                               $url = $CONF['CategoryURL'] . '?catid=' . $args['catid'];\r
+                               $url = $CONF['CategoryURL'] . '?catid=' . $params['catid'];\r
                        }\r
                        break;\r
 \r
                case 'archivelist':\r
-                       if (!$args['blogid']) {\r
-                               $args['blogid'] = $CONF['DefaultBlog'];\r
+                       if (!$params['blogid']) {\r
+                               $params['blogid'] = $CONF['DefaultBlog'];\r
                        }\r
 \r
                        if ($usePathInfo) {\r
-                               $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $args['blogid'];\r
+                               $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $params['blogid'];\r
                        } else {\r
-                               $url = $CONF['ArchiveListURL'] . '?archivelist=' . $args['blogid'];\r
+                               $url = $CONF['ArchiveListURL'] . '?archivelist=' . $params['blogid'];\r
                        }\r
                        break;\r
 \r
                case 'archive':\r
                        if ($usePathInfo) {\r
-                               $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$args['blogid'].'/' . $args['archive'];\r
+                               $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$params['blogid'].'/' . $params['archive'];\r
                        } else {\r
-                               $url = $CONF['ArchiveURL'] . '?blogid='.$args['blogid'].'&archive=' . $args['archive'];\r
+                               $url = $CONF['ArchiveURL'] . '?blogid='.$params['blogid'].'&archive=' . $params['archive'];\r
                        }\r
                        break;\r
 \r
                case 'blog':\r
                        if ($usePathInfo) {\r
-                               $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $args['blogid'];\r
+                               $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $params['blogid'];\r
                        } else {\r
-                               $url = $CONF['BlogURL'] . '?blogid=' . $args['blogid'];\r
+                               $url = $CONF['BlogURL'] . '?blogid=' . $params['blogid'];\r
                        }\r
                        break;\r
        }\r
 \r
-       return addLinkParams($url, (isset($args['extra'])? $args['extra'] : null));\r
+       return addLinkParams($url, (isset($params['extra'])? $params['extra'] : null));\r
 }\r
 \r
 function createBlogLink($url, $params) {\r
@@ -2445,4 +2439,4 @@ function strftimejp($format,$timestamp = ''){
                : strftime($format,$timestamp)\r
        ;\r
 }\r
-?>
\ No newline at end of file
+?>\r