[xoops-svn] SF.net SVN: xoops-svn:[10366] XoopsCore/branches/2.6.x/2.6.0/htdocs/class

[<tr...@us...>]

Revision: 10366
          http://sourceforge.net/p/xoops/svn/10366
Author:   trabis
Date:     2012-12-12 00:09:45 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Fixing small bugs

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslocal.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php	2012-12-11 23:01:05 UTC (rev 10365)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php	2012-12-12 00:09:45 UTC (rev 10366)
@@ -254,25 +254,25 @@
     /**
      * XoopsUserUtility::getUnameFromIds()
      *
-     * @param int $uid
-     * @param bool $usereal
-     * @param bool $linked
+     * @param array $uids
+     * @param bool  $usereal
+     * @param bool  $linked
      *
      * @return array
      */
-    static function getUnameFromIds($uid, $usereal = false, $linked = false)
+    static function getUnameFromIds($uids, $usereal = false, $linked = false)
     {
         $xoops = Xoops::getInstance();
-        if (!is_array($uid)) {
-            $uid = array($uid);
+        if (!is_array($uids)) {
+            $uids = array($uids);
         }
-        $userid = array_map('intval', array_filter($uid));
+        $userids = array_map('intval', array_filter($uids));
 
         $myts = MyTextSanitizer::getInstance();
         $users = array();
-        if (count($userid) > 0) {
+        if (count($userids) > 0) {
             $criteria = new CriteriaCompo(new Criteria('level', 0, '>'));
-            $criteria->add(new Criteria('uid', "('" . implode(',', array_unique($userid)) . "')", 'IN'));
+            $criteria->add(new Criteria('uid', "('" . implode(',', array_unique($userids)) . "')", 'IN'));
 
             $user_handler = $xoops->getHandlerUser();
             if (!$rows = $user_handler->getAll($criteria, array('uid', 'uname', 'name'), false, true)) {

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php	2012-12-11 23:01:05 UTC (rev 10365)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php	2012-12-12 00:09:45 UTC (rev 10366)
@@ -333,7 +333,7 @@
             'xoopsmembershiphandler' => XOOPS_ROOT_PATH . '/kernel/membership.php',
             'xoopsmodelfactory' => XOOPS_ROOT_PATH . '/class/model/xoopsmodel.php',
             'xoopsmoduleadmin' => XOOPS_ROOT_PATH . '/class/moduleadmin.php',
-            'xoopsmodules' => XOOPS_ROOT_PATH . '/kernel/module.php',
+            'xoopsmodule' => XOOPS_ROOT_PATH . '/kernel/module.php',
             'xoopsmodulehandler' => XOOPS_ROOT_PATH . '/kernel/module.php',
             'xoopsmultimailer' => XOOPS_ROOT_PATH . '/class/mail/xoopsmultimailer.php',
             'xoopsnotification' => XOOPS_ROOT_PATH . '/kernel/notification.php',

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslocal.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslocal.php	2012-12-11 23:01:05 UTC (rev 10365)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslocal.php	2012-12-12 00:09:45 UTC (rev 10366)
@@ -260,9 +260,7 @@
      */
     public function __call($name, $args)
     {
-        exit($name);
         if (function_exists($name)) {
-            exit($name);
             return call_user_func_array($name, $args);
         }
         return null;