This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php | |
index 4aee52abbe..d209ee3d08 100644 | |
--- a/phpBB/language/en/acp/board.php | |
+++ b/phpBB/language/en/acp/board.php | |
@@ -185,10 +185,10 @@ $lang = array_merge($lang, array( | |
'MAX_POLL_OPTIONS' => 'Maximum number of poll options', | |
'MAX_POST_FONT_SIZE' => 'Maximum font size per post', | |
'MAX_POST_FONT_SIZE_EXPLAIN' => 'Maximum font size allowed in a post. Set to 0 for unlimited font size.', | |
- 'MAX_POST_IMG_HEIGHT' => 'Maximum image height per post', | |
- 'MAX_POST_IMG_HEIGHT_EXPLAIN' => 'Maximum height of an image/flash file in postings. Set to 0 for unlimited size.', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html | |
index 994d75f24..b5e12cdde 100644 | |
--- a/phpBB/styles/prosilver/template/viewforum_body.html | |
+++ b/phpBB/styles/prosilver/template/viewforum_body.html | |
@@ -250,10 +250,10 @@ | |
<strong>{L_NO_TOPICS}</strong> | |
</div> | |
</div> | |
- <!-- ELSE IF not S_USER_CAN_POST --> | |
+ <!-- ELSE IF not S_HAS_SUBFORUM --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/README.md b/README.md | |
index 53757c8..567d6dd 100644 | |
--- a/README.md | |
+++ b/README.md | |
@@ -6,7 +6,7 @@ Author: Christian Schnegelberger | |
URL: http://www.crizzo.de | |
-Version: v2.1.x | |
+Version: v2.1.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/README.md b/README.md | |
index c868d16..6515969 100644 | |
--- a/README.md | |
+++ b/README.md | |
@@ -6,7 +6,7 @@ Author: Christian Schnegelberger | |
URL: http://www.crizzo.de | |
-Version: v2.0.4 | |
+Version: v2.0.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/language/en/viglink_module_acp.php b/language/en/viglink_module_acp.php | |
index 58954ac..ada6ca4 100644 | |
--- a/language/en/viglink_module_acp.php | |
+++ b/language/en/viglink_module_acp.php | |
@@ -41,6 +41,7 @@ $lang = array_merge($lang, array( | |
'ACP_VIGLINK_SETTINGS' => 'VigLink settings', | |
'ACP_VIGLINK_SETTINGS_EXPLAIN' => 'VigLink is third-party service that discretely monetises links posted by users of your forum without any change to the user experience. When users click on your outbound links to products or services and buy something, the merchants pay VigLink a commission, of which a share is donated to the phpBB project. By choosing to enable VigLink and donating proceeds to the phpBB project, you are supporting our open source organisation and ensuring our continued financial security.', | |
'ACP_VIGLINK_SETTINGS_CHANGE' => 'You can change these settings at any time in the “<a href="%1$s">VigLink settings</a>” panel.', | |
+ 'ACP_VIGLINK_SUPPORT_EXPLAIN' => 'You will no longer be redirected to this |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
public function add_simpleimprint_viewonline($event) | |
{ | |
if($event['location_url'] == ('/imprint.php' || 'app.php/imprint' || '/imprint' )) | |
{ | |
if ($event['row']['session_page'] === 'app.' . $this->php_ext . '/imprint' || | |
$event['row']['session_page'] === 'app.' . $this->php_ext . '/imprint.php') | |
{ | |
$event['location'] = $this->user->lang('VIEWONLINE_SIMPLEIMPRINT'); | |
$event['location_url'] = $this->helper->route('crizzo_simpleimprint'); | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
public function add_simpleimprint_viewonline($event) | |
{ | |
global $forum_data; | |
$route = $this->helper->generate_router(); | |
$event['location_url'] = $route->get_url(); | |
if($event['location_url'] == ('/imprint.php' || 'app.php/imprint' || '/imprint' ) | |
{ | |
$event['location'] = $this->user->lang('VIEWONLINE_SIMPLEIMPRINT'); | |
} |