diff --git a/module/api/control.php b/module/api/control.php index f078d23bdf..99dd6072c4 100755 --- a/module/api/control.php +++ b/module/api/control.php @@ -73,11 +73,11 @@ class api extends control if($libs) $this->lang->modulePageNav = $this->generateLibsDropMenu($libs, $libID, $release); $this->setMenu($libID, $moduleID); - if($apiID == 0) $this->lang->TRActions = ' ' . $this->lang->api->search . '' . $this->lang->TRActions; + $this->lang->TRActions = ' ' . $this->lang->api->search . '' . $this->lang->TRActions; /* Build the search form. */ $queryID = $param == 'bySearch' ? (int)$queryID : 0; - $actionURL = $this->createLink('api', 'index', "libID=$libID&moduleID=$moduleID&apiID=$apiID&version=$version&release=$release&appendLib=$appendLib&queryID=myQueryID¶m=bySearch"); + $actionURL = $this->createLink('api', 'index', "libID=$libID&moduleID=0&apiID=0&version=0&release=0&appendLib=0&queryID=myQueryID¶m=bySearch"); $this->api->buildSearchForm($lib,$queryID, $actionURL); if($param == 'bySearch') diff --git a/module/block/lang/de.php b/module/block/lang/de.php index b2806436ea..bd28ed720d 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -90,8 +90,8 @@ $lang->block->remove = 'Entfernen'; $lang->block->refresh = 'Aktualisieren'; $lang->block->nbsp = ''; $lang->block->hidden = 'Verstecken'; -$lang->block->dynamicInfo = "%s %s %s %s %s"; -$lang->block->noLinkDynamic = "%s %s %s %s %s"; +$lang->block->dynamicInfo = "%s %s%s%s%s"; +$lang->block->noLinkDynamic = "%s %s%s%s%s"; $lang->block->cannotPlaceInLeft = 'Kann den Block nicht auf der linken Seite platzieren.'; $lang->block->cannotPlaceInRight = 'Kann den Block nicht auf der rechten Seite platzieren.'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 737031e7b6..4468cf9cc6 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -90,8 +90,8 @@ $lang->block->remove = 'Remove'; $lang->block->refresh = 'Refresh'; $lang->block->nbsp = ' '; $lang->block->hidden = 'Hide'; -$lang->block->dynamicInfo = "%s %s %s %s %s"; -$lang->block->noLinkDynamic = "%s %s %s %s %s"; +$lang->block->dynamicInfo = "%s %s%s%s%s"; +$lang->block->noLinkDynamic = "%s %s%s%s%s"; $lang->block->cannotPlaceInLeft = 'Cannot place the block at left side.'; $lang->block->cannotPlaceInRight = 'Cannot place the block at right side.'; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index d9309801ab..251cf50757 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -90,8 +90,8 @@ $lang->block->remove = 'Supprimer'; $lang->block->refresh = 'Rafraichir'; $lang->block->nbsp = ' '; $lang->block->hidden = 'Masquer'; -$lang->block->dynamicInfo = "%s %s %s %s %s"; -$lang->block->noLinkDynamic = "%s %s %s %s %s"; +$lang->block->dynamicInfo = "%s %s%s%s%s"; +$lang->block->noLinkDynamic = "%s %s%s%s%s"; $lang->block->cannotPlaceInLeft = 'Impossible de placer le bloc à gauche.'; $lang->block->cannotPlaceInRight = 'Impossible de placer le bloc à droite.'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 48c3a2019d..8aa16f8abb 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -90,8 +90,8 @@ $lang->block->remove = '移除'; $lang->block->refresh = '刷新'; $lang->block->nbsp = ''; $lang->block->hidden = '隐藏'; -$lang->block->dynamicInfo = "%s %s %s %s %s"; -$lang->block->noLinkDynamic = "%s %s %s %s %s"; +$lang->block->dynamicInfo = "%s %s%s%s%s"; +$lang->block->noLinkDynamic = "%s %s%s%s%s"; $lang->block->cannotPlaceInLeft = '此区块无法放置在左侧。'; $lang->block->cannotPlaceInRight = '此区块无法放置在右侧。'; diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php index f9f3b99159..2aa17ecc16 100644 --- a/module/block/view/dynamic.html.php +++ b/module/block/view/dynamic.html.php @@ -4,9 +4,13 @@