Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions docs/lang_diff.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@ LANGUAGE DIFFERENCES

Below are language differences from a version to next version.

================================
2026/05/17: Version 2.7.1-Betas
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Align release label with the shipped version string.

Version 2.7.1-Betas is inconsistent with the actual release target (2.7.1-Beta1), which can cause changelog ambiguity.

Suggested doc fix
-2026/05/17: Version 2.7.1-Betas
+2026/05/17: Version 2.7.1-Beta1
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
2026/05/17: Version 2.7.1-Betas
2026/05/17: Version 2.7.1-Beta1
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@docs/lang_diff.txt` at line 7, Update the release label string in the
changelog entry currently reading "Version 2.7.1-Betas" to match the shipped
version "Version 2.7.1-Beta1"; locate the text "Version 2.7.1-Betas" in
docs/lang_diff.txt and replace it with "Version 2.7.1-Beta1" to ensure the
release label matches the actual release tag.

================================
/htdocs/modules/system/language/english/admin/blocksadmin.php
- added define('_AM_SYSTEM_BLOCKS_INVALID_CLONE', 'Invalid block parameters.');

================================
2025/03/30: Version 2.7.0-Betas (previously released as 2.5.12-Betas)
================================
/htdocs/install/language/english/install.php
- added define('MISSING_REQUIRED_EXTENSIONS', 'Required PHP extensions are missing');
- added define('MISSING_REQUIRED_EXTENSIONS_MSG', 'XOOPS cannot be installed because the following mandatory PHP extension(s) are not available: %s. Enable them in your PHP configuration (php.ini) and restart your web server, then reload this page.');

/htdocs/modules/system/language/english/admin/blocksadmin.php
- added define('_AM_SYSTEM_BLOCKS_INVALIDCLONE', 'Invalid block parameters.');

/htdocs/modules/system/language/english/admin.php
- added define('_AM_SYSTEM_MENUS', 'Menus');
- added define('_AM_SYSTEM_MENUS_DESC', 'Manage site navigation menus');
Expand Down
2 changes: 1 addition & 1 deletion htdocs/include/version.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
/**
* Define XOOPS version
*/
define('XOOPS_VERSION', 'XOOPS 2.7.0');
define('XOOPS_VERSION', 'XOOPS 2.7.1-Beta1');
3 changes: 3 additions & 0 deletions htdocs/modules/debugbar/class/DebugbarLogger.php
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,9 @@ public function addSmarty()
return;
}

$helper = Helper::getInstance();
$helper->loadLanguage('main');

// Normalize values for display
foreach ($data as $k => $v) {
if ($v === '') {
Expand Down
6 changes: 3 additions & 3 deletions htdocs/modules/system/admin/blocksadmin/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@
|| false !== strpos($clone_dirname, '\\')
|| false !== strpos($clone_dirname, '..')
|| false !== strpos($clone_dirname, "\0"))) {
redirect_header('admin.php?fct=blocksadmin', 3, _AM_SYSTEM_BLOCKS_INVALIDCLONE);
redirect_header('admin.php?fct=blocksadmin', 3, _AM_SYSTEM_BLOCKS_INVALID_CLONE);
}
// func_file is the block PHP file under modules/<dirname>/blocks/
// (a subdirectory is allowed - some modules nest block files);
Expand All @@ -328,12 +328,12 @@
|| false !== strpos($clone_path, '\\')
|| false !== strpos($clone_path, "\0")
|| str_starts_with($clone_path, '/'))) {
redirect_header('admin.php?fct=blocksadmin', 3, _AM_SYSTEM_BLOCKS_INVALIDCLONE);
redirect_header('admin.php?fct=blocksadmin', 3, _AM_SYSTEM_BLOCKS_INVALID_CLONE);
}
}
foreach ([$clone_show_func, $clone_edit_func] as $clone_func) {
if ($clone_func !== '' && !preg_match('/^[A-Za-z_]\w*$/', $clone_func)) {
redirect_header('admin.php?fct=blocksadmin', 3, _AM_SYSTEM_BLOCKS_INVALIDCLONE);
redirect_header('admin.php?fct=blocksadmin', 3, _AM_SYSTEM_BLOCKS_INVALID_CLONE);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@
define('_AM_SYSTEM_BLOCKS_FOOTER_LEFT', 'Footer Left');
define('_AM_SYSTEM_BLOCKS_FOOTER_CENTER', 'Footer Center');
define('_AM_SYSTEM_BLOCKS_FOOTER_RIGHT', 'Footer Right');
define('_AM_SYSTEM_BLOCKS_INVALIDCLONE', 'Invalid block parameters.');
define('_AM_SYSTEM_BLOCKS_INVALID_CLONE', 'Invalid block parameters.');
4 changes: 3 additions & 1 deletion tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,10 @@
}

// XOOPS version + cache path (needed by Frameworks)
// Source the real version.php so VersionTest exercises the shipped value
// rather than a duplicated literal that silently drifts on each bump.
if (!defined('XOOPS_VERSION')) {
define('XOOPS_VERSION', 'XOOPS 2.7.0-RC1');
require_once XOOPS_ROOT_PATH . '/include/version.php';
}
if (!defined('XOOPS_CACHE_PATH')) {
define('XOOPS_CACHE_PATH', XOOPS_VAR_PATH . '/caches/xoops_cache');
Expand Down
5 changes: 3 additions & 2 deletions tests/unit/htdocs/include/VersionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ public function testXoopsVersionContainsVersionNumber()

public function testXoopsVersionValue()
{
// Verify the version starts with the expected major.minor.patch
$this->assertStringStartsWith('XOOPS 2.7.0', XOOPS_VERSION, 'Version should start with XOOPS 2.7.0');
// Verify the version starts with the expected major.minor line
// (kept at 2.7. so patch/pre-release bumps within the line don't churn this test)
$this->assertStringStartsWith('XOOPS 2.7.', XOOPS_VERSION, 'Version should start with XOOPS 2.7.');
}

public function testXoopsVersionContainsXoopsPrefix()
Expand Down