Skip to content

Commit 727127f

Browse files
authored
Merge pull request #1547 from mambax7/feature/beta7_updates
Beta7 updates
2 parents ab1732a + 81789f5 commit 727127f

12 files changed

Lines changed: 5779 additions & 31872 deletions

File tree

docs/lang_diff.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ LANGUAGE DIFFERENCES
44
Below are language differences from a version to next version.
55

66
================================
7-
2025/03/30: Version 2.5.12-Beta5
7+
2025/03/30: Version 2.5.12-Betas
88
================================
99
/htdocs/modules/system/language/english/blocks.php
1010
-added define('_MB_SYSTEM_WAITING_CONTENT_DEPRECATED', "Block 'Waiting Contents' is deprecated since XOOPS 2.5.11, please use Waiting module");
1111

12+
/htdocs/install/language/english/welcome.php
13+
- updated PHP & MySQL versions
14+
1215
================================
1316
2023/10/01: Version 2.5.11-Final
1417
================================

htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ public function renderAbout($business = '', $logo_xoops = true)
503503
$date = explode('/', $date);
504504
$author = explode(',', $this->_obj->getInfo('author'));
505505
$nickname = explode(',', $this->_obj->getInfo('nickname'));
506-
$release_date = formatTimestamp(mktime(0, 0, 0, $date[1], $date[2], $date[0]), 's');
506+
$release_date = formatTimestamp(mktime(0, 0, 0, (int)$date[1], (int)$date[2], (int)$date[0]), 's');
507507
$module_dir = $this->_obj->getVar('dirname');
508508
$module_info = "<div id=\"about\"><label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_DESCRIPTION . "</label>\n"
509509
. "<text>" . $this->_obj->getInfo('description') . "</text><br>\n"

htdocs/class/xml/rpc/xoopsapi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ public function &getCategories($respond = true)
353353
} else {
354354
include_once XOOPS_ROOT_PATH . '/class/xoopstopic.php';
355355
$this->db = XoopsDatabaseFactory::getDatabaseConnection();
356-
$xt = new XoopsTopic($db->prefix('topics'));
356+
$xt = new XoopsTopic($this->db->prefix('topics'));
357357
$ret = $xt->getTopicsList();
358358
if (!$respond) {
359359
return $ret;

htdocs/class/xoopseditor/tinymce5/tinymce5/CHANGELOG.md

Lines changed: 2726 additions & 0 deletions
Large diffs are not rendered by default.

htdocs/class/xoopseditor/tinymce5/tinymce5/changelog.txt

Lines changed: 0 additions & 1659 deletions
This file was deleted.

htdocs/class/xoopseditor/tinymce5/tinymce5/jscripts/tiny_mce/jquery.tinymce.js

Lines changed: 0 additions & 92 deletions
This file was deleted.

0 commit comments

Comments
 (0)