[xoops-cvslog 2282] CVS update: xoops2jp/html/include

Back to archive index

onokazu onoka****@users*****
2006年 2月 5日 (日) 14:19:52 JST


Index: xoops2jp/html/include/cp_functions.php
diff -u xoops2jp/html/include/cp_functions.php:1.4 xoops2jp/html/include/cp_functions.php:1.4.6.1
--- xoops2jp/html/include/cp_functions.php:1.4	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/include/cp_functions.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: cp_functions.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $
+// $Id: cp_functions.php,v 1.4.6.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -54,7 +54,7 @@
         echo '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/system/style.css" />';
         include_once XOOPS_CACHE_PATH.'/adminmenu.php';
         $moduleperm_handler =& xoops_gethandler('groupperm');
-        $admin_mids =& $moduleperm_handler->getItemIds('module_admin', $xoopsUser->getGroups());
+        $admin_mids = $moduleperm_handler->getItemIds('module_admin', $xoopsUser->getGroups());
 
         $module_handler =& xoops_gethandler('module');
         $modules =& $module_handler->getObjects(new
Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.6 xoops2jp/html/include/functions.php:1.6.2.1
--- xoops2jp/html/include/functions.php:1.6	Mon Oct 24 20:44:16 2005
+++ xoops2jp/html/include/functions.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.6 2005/10/24 11:44:16 onokazu Exp $
+// $Id: functions.php,v 1.6.2.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -522,10 +522,12 @@
     if ( file_exists(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/xoopsmailerlocal.php") ) {
         include_once XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/xoopsmailerlocal.php";
         if ( class_exists("XoopsMailerLocal") ) {
-            return new XoopsMailerLocal();
+            $ret =& new XoopsMailerLocal();
+            return $ret;
         }
     }
-    return new XoopsMailer();
+    $ret =& new XoopsMailer();
+    return $ret;
 }
 
 function &xoops_gethandler($name, $optional = false )
@@ -544,7 +546,11 @@
     if (!isset($handlers[$name]) && !$optional ) {
         trigger_error('Class <b>'.$class.'</b> does not exist<br />Handler Name: '.$name, E_USER_ERROR);
     }
-    return isset($handlers[$name]) ? $handlers[$name] : false;
+    $ret = false;
+    if (isset($handlers[$name])) {
+        $ret =& $handlers[$name];
+    }
+    return $ret;
 }
 
 function &xoops_getmodulehandler($name = null, $module_dir = null, $optional = false)
@@ -574,7 +580,11 @@
     if (!isset($handlers[$module_dir][$name]) && !$optional) {
         trigger_error('Handler does not exist<br />Module: '.$module_dir.'<br />Name: '.$name, E_USER_ERROR);
     }
-    return isset($handlers[$module_dir][$name]) ? $handlers[$module_dir][$name] : false;
+    $ret = false;
+    if (isset($handlers[$module_dir][$name])) {
+        $ret =& $handlers[$module_dir][$name];
+    }
+    return $ret;
 }
 
 function xoops_getrank($rank_id =0, $posts = 0)
Index: xoops2jp/html/include/xoopscodes.php
diff -u xoops2jp/html/include/xoopscodes.php:1.4 xoops2jp/html/include/xoopscodes.php:1.4.6.1
--- xoops2jp/html/include/xoopscodes.php:1.4	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/include/xoopscodes.php	Sun Feb  5 14:19:52 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopscodes.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $
+// $Id: xoopscodes.php,v 1.4.6.1 2006/02/05 05:19:52 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -81,7 +81,7 @@
 function xoopsSmilies($textarea_id)
 {
     $myts =& MyTextSanitizer::getInstance();
-    $smiles =& $myts->getSmileys();
+    $smiles = $myts->getSmileys();
     if (empty($smileys)) {
         $db =& Database::getInstance();
         if ($result = $db->query('SELECT * FROM '.$db->prefix('smiles').' WHERE display=1')) {


xoops-cvslog メーリングリストの案内
Back to archive index