Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add PHP 7.x and SMF 2.0.15 support. #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add PHP 7.x and SMF 2.0.15 support. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/PortaMx/Class/System/PortaMx_AdminArticlesClass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class PortaMxC_AdminArticles
* Saved the config, load the article css file if exist.
* Have the article a css file, the class definition is extracted from ccs header
*/
function PortaMxC_AdminArticles($config)
function __construct($config)
{
global $context, $settings;

Expand Down
2 changes: 1 addition & 1 deletion Sources/PortaMx/Class/System/PortaMx_AdminBlocksClass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class PortaMxC_AdminBlocks
* Saved the config, load the block css if exist.
* Have the block a css file, the class definition is extracted from ccs header
*/
function PortaMxC_AdminBlocks($blockconfig)
function __construct($blockconfig)
{
global $context, $settings;

Expand Down
2 changes: 1 addition & 1 deletion Sources/PortaMx/Class/System/PortaMx_AdminCategoriesClass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class PortaMxC_AdminCategories
* Saved the config, load the category css file if exist.
* Have the category a css file, the class definition is extracted from ccs header
*/
function PortaMxC_AdminCategories($config)
function __construct($config)
{
global $context, $settings;

Expand Down
2 changes: 1 addition & 1 deletion Sources/PortaMx/Class/System/PortaMx_BlocksClass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class PortaMxC_Blocks
* Saved the config and checks the visiblity access.
* If access true, the block css file is loaded if exist.
*/
function PortaMxC_Blocks($blockconfig, &$visible)
function __construct($blockconfig, &$visible)
{
global $context, $options, $user_info, $settings, $mbname, $scripturl, $modSettings, $maintenance;

Expand Down
6 changes: 4 additions & 2 deletions install/pmxinstall.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,15 +260,17 @@ function loadUserSettings()
{
global $modSettings, $user_settings, $sourcedir, $smcFunc;
global $cookiename, $user_info, $language;
global $boardurl, $image_proxy_enabled, $image_proxy_secret;

// Check first the integration, then the cookie, and last the session.
if (count($integration_ids = call_integration_hook('integrate_verify_user')) > 0)
]]></search>
<add><![CDATA[
function loadUserSettings($checkOnly = false)
function loadUserSettings()
{
global $modSettings, $user_settings, $sourcedir, $smcFunc;
global $cookiename, $user_info, $language;
global $boardurl, $image_proxy_enabled, $image_proxy_secret;

// Check first the integration, then the cookie, and last the session.
if (empty($checkOnly) && count($integration_ids = call_integration_hook('integrate_verify_user')) > 0)
Expand Down Expand Up @@ -384,7 +386,7 @@ function loadSession()
<search position="before"><![CDATA[
function Login()
{
global $txt, $context, $scripturl;
global $txt, $context, $scripturl, $smcFunc;
]]></search>
<add><![CDATA[
if(!pmx_checkECL_Cookie())
Expand Down