Skip to content

Commit 6f00b4d

Browse files
authored
Merge pull request #132 from txmodxoops/patch-1
Patch 1
2 parents 04c1e9d + 0e71a67 commit 6f00b4d

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

class/files/sql/SqlFile.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private function getHeaderSqlComments($moduleName)
7979
$date = date('D M d, Y');
8080
$time = date('G:i');
8181
$serverName = $_SERVER['SERVER_NAME'];
82-
$serverVersion = mysql_get_server_info();
82+
$serverVersion = $GLOBALS['xoopsDB']->getServerVersion();
8383
$phpVersion = phpversion();
8484
// Header Sql Comments
8585
$ret = $this->getSimpleString("# SQL Dump for {$moduleName} module");

class/files/user/UserXoopsVersion.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ private function getXoopsVersionConfig($module, $table, $language)
495495

496496
if (1 == $table->getVar('table_permissions')) {
497497
$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Get groups');
498-
$ret .= $xCodeVConfig->getXcEqualsOperator('$memberHandler ', "xoops_gethandler('member')", true);
498+
$ret .= $xCodeVConfig->getXcEqualsOperator('$memberHandler ', "xoops_gethandler('member')");
499499
$ret .= $xCodeVConfig->getXcEqualsOperator('$xoopsGroups ', '$memberHandler->getGroupList()');
500500
$group = $xCodeVConfig->getXcEqualsOperator('$groups[$group] ', '$key');
501501
$ret .= $phpCodeVConfig->getPhpCodeForeach('xoopsGroups', false, 'key', 'group', $group);
@@ -506,7 +506,7 @@ private function getXoopsVersionConfig($module, $table, $language)
506506
$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Get Admin groups');
507507
$ret .= $xCodeVConfig->getXcEqualsOperator('$criteria ', 'new CriteriaCompo()');
508508
$ret .= $this->getSimpleString("\$criteria->add( new Criteria( 'group_type', 'Admin' ) );");
509-
$ret .= $xCodeVConfig->getXcEqualsOperator('$memberHandler ', "xoops_gethandler('member')", true);
509+
$ret .= $xCodeVConfig->getXcEqualsOperator('$memberHandler ', "xoops_gethandler('member')");
510510
$ret .= $xCodeVConfig->getXcEqualsOperator('$adminXoopsGroups ', '$memberHandler->getGroupList($criteria)');
511511
$adminGroup = $xCodeVConfig->getXcEqualsOperator('$adminGroups[$adminGroup] ', '$key');
512512
$ret .= $phpCodeVConfig->getPhpCodeForeach('adminXoopsGroups', false, 'key', 'adminGroup', $adminGroup);

0 commit comments

Comments
 (0)