Merge branch 'upstream/4.0-dev' into feature/htmlhelper-for-an-icon

joomla · Oct 26, 2020 · b1660ab · b1660ab
2 parents 2a943c4 + 42cf9bd
commit b1660ab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -71,7 +71,7 @@ install:
     - IF %PHP%==1 echo opcache.enable_cli=1 >> php.ini
     - IF %PHP%==1 echo extension=php_ldap.dll >> php.ini
     - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
-    - IF %PHP%==1 php -r "readfile('http://getcomposer.org/installer');" | php
+    - IF %PHP%==1 php -r "readfile('https://getcomposer.org/composer-1.phar');" > composer.phar
     - cd C:\projects\joomla-cms
     - appveyor-retry composer install --no-progress --profile
 before_test:

diff --git a/language/en-GB/com_content.ini b/language/en-GB/com_content.ini
@@ -87,4 +87,4 @@ COM_CONTENT_TRANSITION="Transition"
 COM_CONTENT_VOTES="Vote"
 COM_CONTENT_VOTES_COUNT="Vote: %s"
 COM_CONTENT_WORKFLOW="Workflow"
-COM_CONTENT_WRITTEN_BY="Written by %s"
+COM_CONTENT_WRITTEN_BY="Written by: %s"
diff --git a/plugins/content/pagenavigation/pagenavigation.php b/plugins/content/pagenavigation/pagenavigation.php
@@ -173,7 +173,7 @@ public function onContentBeforeDisplay($context, &$row, &$params, $page = 0)
 				->bind(':catid', $row->catid, ParameterType::INTEGER)
 				->bind(':state', $row->state, ParameterType::INTEGER);
 
-			if ($canPublish)
+			if (!$canPublish)
 			{
 				$query->whereIn($db->quoteName('a.access'), Access::getAuthorisedViewLevels($user->id));
 			}