fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-31 17:55:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rhymix:master' into master

Browse source
This commit is contained in:
Lastorder 2025-03-06 21:57:47 +09:00 • committed by GitHub
commit 81d91f2f83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
130 changed files with 1590 additions and 1557 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/board/tpl/board_insert.html
View file

@ -18,7 +18,7 @@
<label class="x_control-label" for="board_name">{$lang->url}</label>
<div class="x_controls">
<select name="domain_srl" id="domain_srl">
<option value="-1" selected="selected"|cond="!isset($module_info->domain_srl) || $module_info->domain_srl == -1">{$lang->cmd_any_domain}</option>
<option value="-1" selected="selected"|cond="!isset($module_info->domain_srl) || $module_info->domain_srl == -1">{lang('admin.cmd_any_domain')}</option>
{@ $domain_srl_list = []}
<!--@foreach(ModuleModel::getAllDomains(100)->data as $domain)-->
<option value="{$domain->domain_srl}" selected="selected"|cond="$domain->domain_srl == $module_info->domain_srl">{$domain->domain}</option>

2
modules/member/member.model.php
View file

@ -1437,7 +1437,7 @@ class MemberModel extends Member
$args->page = $page;
if($logged_info->is_admin == 'Y')
{
if($search_keyword && $search_keyword)
if($search_target && $search_keyword)
{
switch ($search_target)
{

4
modules/menu/tpl/sitemap.html
View file

@ -209,7 +209,7 @@
<li>
<div class="multilingual x_input-append">
<label for="lang_menuDesc2">{$lang->menu_desc}</label>
<input id="menuDesc2" class="_menuDesc lang_code" type="text" required>
<textarea id="menuDesc2" class="_menuDesc lang_code"></textarea>
</div>
</li>
<li class="typePage">
@ -288,7 +288,7 @@
<li>
<div class="multilingual x_input-append">
<label for="lang_menuDesc">{$lang->menu_desc}</label>
<input id="menuDesc" class="_menuDesc lang_code" type="text" required>
<textarea id="menuDesc" class="_menuDesc lang_code"></textarea>
</div>
</li>
<li style="padding:6px 0 0 0">

4
modules/module/module.model.php
View file

@ -195,13 +195,13 @@ class ModuleModel extends Module
/**
* @brief Get the default mid according to the domain
*/
public static function getDefaultMid($domain = null)
public static function getDefaultMid($domain = '')
{
// Get current domain.
$domain = $domain ? Rhymix\Framework\URL::decodeIdna($domain) : Rhymix\Framework\URL::getCurrentDomain();
// Find the domain information.
$domain_info = self::getSiteInfoByDomain($domain);
$domain_info = $domain ? self::getSiteInfoByDomain($domain) : null;
if (!$domain_info)
{
$domain_info = self::getDefaultDomainInfo();

2
modules/page/tpl/page_info.html
View file

@ -18,7 +18,7 @@
<label class="x_control-label" for="page_name">{$lang->url}</label>
<div class="x_controls">
<select name="domain_srl" id="domain_srl">
<option value="-1" selected="selected"|cond="!isset($module_info->domain_srl) || $module_info->domain_srl == -1">{$lang->cmd_any_domain}</option>
<option value="-1" selected="selected"|cond="!isset($module_info->domain_srl) || $module_info->domain_srl == -1">{lang('admin.cmd_any_domain')}</option>
{@ $domain_srl_list = []}
<!--@foreach(ModuleModel::getAllDomains(100)->data as $domain)-->
<option value="{$domain->domain_srl}" selected="selected"|cond="$domain->domain_srl == $module_info->domain_srl">{$domain->domain}</option>