diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php index d9eb4a81da04c..cadcc20afd556 100644 --- a/components/com_content/helpers/icon.php +++ b/components/com_content/helpers/icon.php @@ -174,12 +174,8 @@ public static function edit($article, $params, $attribs = array(), $legacy = fal */ public static function print_popup($article, $params, $attribs = array(), $legacy = false) { - $app = JFactory::getApplication(); - $input = $app->input; - $request = $input->request; - $url = ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language); - $url .= '&tmpl=component&print=1&layout=default&page=' . @ $request->limitstart; + $url .= '&tmpl=component&print=1&layout=default'; $status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no'; diff --git a/installation/language/en-GB/en-GB.ini b/installation/language/en-GB/en-GB.ini index 5f77fc8c5d45e..d303a1a524455 100644 --- a/installation/language/en-GB/en-GB.ini +++ b/installation/language/en-GB/en-GB.ini @@ -31,9 +31,9 @@ INSTL_DATABASE="Database Configuration" INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL database query failed." INSTL_DATABASE_HOST_DESC="This is usually "localhost" or a name provided by your host." INSTL_DATABASE_HOST_LABEL="Host Name" -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You want to use a database host which is not localhost. For security reason, you need to verify the ownership of the used webhosting account. Please see here [docspagelink] for more information." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="In order to confirm that you are the the owner of this webhost please delete the file %s we have just created in the "installation" folder of your Joomla." -INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="For some reason we are not able to create the file. Please manually create a file called %s and upload it to the "installation" folder of your Joomla." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="We were not able to create the file. Please manually create a file named "%s" and upload it to the "installation" folder of your Joomla site." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="In order to confirm that you are the the owner of this website please delete the file named "%s" we have just created in the "installation" folder of your Joomla site." +INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. Please read the documentation for more information." INSTL_DATABASE_NAME_DESC="Some hosts allow only a certain DB name per site. Use table prefix in this case for distinct Joomla! sites." INSTL_DATABASE_NAME_LABEL="Database Name" INSTL_DATABASE_NO_SCHEMA="No database schema exists for this database type." diff --git a/libraries/src/Joomla/CMS/Version.php b/libraries/src/Joomla/CMS/Version.php index 17745f14b9af5..55e664911e491 100644 --- a/libraries/src/Joomla/CMS/Version.php +++ b/libraries/src/Joomla/CMS/Version.php @@ -73,7 +73,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '11-July-2017'; + const RELDATE = '18-July-2017'; /** * Release time. @@ -81,7 +81,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '16:52'; + const RELTIME = '16:03'; /** * Release timezone.