Permalink
Browse files

Merge branch 'master' into template9

Conflicts:
	templates/system/html/modules.php
  • Loading branch information...
realityking committed Aug 14, 2012
2 parents e8aee3d + 7cfebd3 commit e9e6e68bf36658c0f06722a5f15e6134dd1abab7
Showing with 284 additions and 6,511 deletions.
  1. +0 −3 administrator/components/com_categories/tables/category.php
  2. +4 −11 administrator/components/com_joomlaupdate/models/default.php
  3. +0 −2 administrator/components/com_menus/tables/menu.php
  4. +3 −0 installation/CHANGELOG
  5. +1 −1 installation/CREDITS
  6. +1 −0 installation/language/vi-VN/index.html
  7. +231 −0 installation/language/vi-VN/vi-VN.ini
  8. +20 −0 installation/language/vi-VN/vi-VN.xml
  9. +2 −2 libraries/cms/help/help.php
  10. +0 −1 libraries/cms/schema/changeset.php
  11. +2 −2 libraries/cms/toolbar/button.php
  12. +2 −2 libraries/cms/toolbar/button/confirm.php
  13. +2 −2 libraries/cms/toolbar/button/custom.php
  14. +2 −2 libraries/cms/toolbar/button/help.php
  15. +2 −2 libraries/cms/toolbar/button/link.php
  16. +2 −2 libraries/cms/toolbar/button/popup.php
  17. +2 −2 libraries/cms/toolbar/button/separator.php
  18. +2 −2 libraries/cms/toolbar/button/standard.php
  19. +2 −2 libraries/cms/toolbar/toolbar.php
  20. +4 −6 templates/system/html/modules.php
  21. +0 −1 tests/index.html
  22. +0 −229 tests/unit/JoomlaDatabaseTestCase.php
  23. +0 −218 tests/unit/JoomlaTestCase.php
  24. +0 −62 tests/unit/bootstrap.php
  25. +0 −36 tests/unit/config.php-dist
  26. +0 −11 tests/unit/objects/bogusload.php
  27. +0 −55 tests/unit/phpunit.php
  28. +0 −13 tests/unit/phpunit.xml
  29. 0 tests/unit/stubs/empty.xml
  30. +0 −159 tests/unit/stubs/jos_assets.csv
  31. +0 −69 tests/unit/stubs/jos_categories.csv
  32. +0 −22 tests/unit/stubs/jos_menu.csv
  33. +0 −8 tests/unit/stubs/jos_user_usergroup_map.csv
  34. +0 −11 tests/unit/stubs/jos_usergroups.csv
  35. +0 −6 tests/unit/stubs/jos_users.csv
  36. +0 −116 tests/unit/stubs/libraries/joomla/error/error.php
  37. +0 −3,744 tests/unit/stubs/test.xml
  38. +0 −93 tests/unit/stubs/xmlFile.xml
  39. +0 −402 tests/unit/suite/libraries/joomla/JVersionTest.php
  40. +0 −118 tests/unit/suite/libraries/joomla/html/JHtmlTest.php
  41. +0 −155 tests/unit/suite/libraries/joomla/installer/JInstallerTest.php
  42. +0 −1 tests/unit/suite/libraries/joomla/installer/stubs/testadapter.php
  43. +0 −132 tests/unit/suite/libraries/joomla/language/JLanguageTest.php
  44. +0 −14 tests/unit/suite/libraries/joomla/language/_ini/bad.ini
  45. +0 −23 tests/unit/suite/libraries/joomla/language/inspectors.php
  46. +0 −136 tests/unit/suite/libraries/joomla/session/JSessionTest.php
  47. +0 −87 tests/unit/suite/libraries/joomla/user/JUserHelperTest.php
  48. +0 −328 tests/unit/suite/libraries/joomla/user/JUserTest.php
  49. +0 −78 tests/unit/suite/libraries/joomla/user/JUserTestGetAuthorisedCategories.php
  50. +0 −140 tests/unit/suite/libraries/joomla/utilities/JDateTest.php
@@ -9,9 +9,6 @@
defined('_JEXEC') or die;
-// Import JTableCategory
-JLoader::register('JTableCategory', JPATH_PLATFORM . '/joomla/database/table/category.php');
-
/**
* Category table
*
@@ -9,6 +9,9 @@
defined('_JEXEC') or die;
+jimport('joomla.filesystem.folder');
+jimport('joomla.filesystem.file');
+
/**
* Joomla! update overview Model
*
@@ -207,7 +210,6 @@ public function download()
$target = $tempdir . '/' . $basename;
// Do we have a cached file?
- jimport('joomla.filesystem.file');
$exists = JFile::exists($target);
if (!$exists)
@@ -324,8 +326,6 @@ public function createRestorationFile($basename = null)
// If the tempdir is not writable, create a new writable subdirectory
if(!$writable) {
- jimport('joomla.filesystem.folder');
-
$FTPOptions = JClientHelper::getCredentials('ftp');
$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], null, $FTPOptions['user'], $FTPOptions['pass']);
$dest = JPath::clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $tempdir.'/admintools'), '/');
@@ -342,16 +342,13 @@ public function createRestorationFile($basename = null)
// Does the JPATH_ROOT/tmp directory exist?
if(!is_dir($tempdir)) {
- jimport('joomla.filesystem.folder');
- jimport('joomla.filesystem.file');
+
JFolder::create($tempdir, 511);
JFile::write($tempdir . '/.htaccess', "order deny, allow\ndeny from all\nallow from none\n");
}
// If it exists and it is unwritable, try creating a writable admintools subdirectory
if(!is_writable($tempdir)) {
- jimport('joomla.filesystem.folder');
-
$FTPOptions = JClientHelper::getCredentials('ftp');
$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], null, $FTPOptions['user'], $FTPOptions['pass']);
$dest = JPath::clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $tempdir.'/admintools'), '/');
@@ -396,7 +393,6 @@ public function createRestorationFile($basename = null)
$data .= ');';
// Remove the old file, if it's there...
- jimport('joomla.filesystem.file');
$configpath = JPATH_COMPONENT_ADMINISTRATOR . '/restoration.php';
if( JFile::exists($configpath) )
{
@@ -651,16 +647,13 @@ public function finaliseUpgrade()
*/
public function cleanUp()
{
- jimport('joomla.filesystem.file');
-
// Remove the update package
$jreg = JFactory::getConfig();
$tempdir = $jreg->getValue('config.tmp_path');
$file = JFactory::getApplication()->getUserState('com_joomlaupdate.file', null);
$target = $tempdir.'/'.$file;
if (!@unlink($target))
{
- jimport('joomla.filesystem.file');
JFile::delete($target);
}
@@ -9,8 +9,6 @@
defined('_JEXEC') or die;
-JLoader::register('JTableMenu', JPATH_PLATFORM . '/joomla/database/table/menu.php');
-
/**
* Menu table
*
View
@@ -26,6 +26,9 @@ $ -> Language fix or change
- -> Removed
! -> Note
+11-Aug-2012 Jean-Marie Simonet
+ $+ Adding Vietnamese vi-VN to installation languages
+
11-Aug-2012 Jean-Marie Simonet
#+ [#25295] Email exposed through RSS and Atom feeds. Thanks Elin and Peter
# [#28795] mod_articles_category "read more" truncation not functioning properly. Thanks Elin.
View
@@ -174,7 +174,7 @@ Turkish (tr-TR) - Joomla! Turkiye - Ümit Kenan Gönüllü
Ukrainian (uk-UA) - Ukrainian Translation Team - Denys Nosov
Urdu Pakistan (ur-PK) - Basim
Uyghur China (ug-CN) - Uyghur Translation Team - Ekber Tursun, Osmanjan Hasen, Abdulla Bisir
-
+Vietnamese (vi-VN) - Joomla Viet Nam Translation Team - Nguyen Huu Hien
-------------------- Joomla! 1.5 Credits ---------------------
@@ -0,0 +1 @@
+<html><body></body></html>

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metafile version="2.5" client="installation">
+ <name>Vietnamese (Vietnam)</name>
+ <version>2.5.6</version>
+ <creationDate>July 2012</creationDate>
+ <author>Joomla Viet Nam Translation Team</author>
+ <copyright>Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.</copyright>
+ <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+ <description></description>
+ <files>
+ <filename>vn-VN.ini</filename>
+ </files>
+ <metadata>
+ <name>Vietnamese (Vietnam)</name>
+ <tag>vi-VN</tag>
+ <rtl>0</rtl>
+ <firstDay>1</firstDay>
+ </metadata>
+ <params />
+</metafile>
@@ -1,6 +1,6 @@
<?php
/**
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Help
*
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
@@ -12,7 +12,7 @@
/**
* Help system class
*
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Help
* @since 1.5
*/
@@ -9,7 +9,6 @@
defined('JPATH_PLATFORM') or die;
-jimport('joomla.filesystem.file');
jimport('joomla.filesystem.folder');
/**
@@ -1,6 +1,6 @@
<?php
/**
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
*
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
@@ -14,7 +14,7 @@
*
* The JButton is the base class for all JButton types
*
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
* @since 3.0
*/
@@ -1,6 +1,6 @@
<?php
/**
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
*
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
@@ -12,7 +12,7 @@
/**
* Renders a standard button with a confirm dialog
*
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
* @since 3.0
*/
@@ -1,6 +1,6 @@
<?php
/**
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
*
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
@@ -12,7 +12,7 @@
/**
* Renders a custom button
*
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
* @since 3.0
*/
@@ -1,6 +1,6 @@
<?php
/**
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
*
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
@@ -12,7 +12,7 @@
/**
* Renders a help popup window button
*
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
* @since 3.0
*/
@@ -1,6 +1,6 @@
<?php
/**
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
*
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
@@ -12,7 +12,7 @@
/**
* Renders a link button
*
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
* @since 3.0
*/
@@ -1,6 +1,6 @@
<?php
/**
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
*
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
@@ -12,7 +12,7 @@
/**
* Renders a popup window button
*
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
* @since 3.0
*/
@@ -1,6 +1,6 @@
<?php
/**
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
*
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
@@ -12,7 +12,7 @@
/**
* Renders a button separator
*
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
* @since 3.0
*/
@@ -1,6 +1,6 @@
<?php
/**
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
*
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
@@ -12,7 +12,7 @@
/**
* Renders a standard button
*
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
* @since 3.0
*/
@@ -1,6 +1,6 @@
<?php
/**
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
*
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
@@ -12,7 +12,7 @@
/**
* ToolBar handler
*
- * @package Joomla.Legacy
+ * @package Joomla.Libraries
* @subpackage Toolbar
* @since 1.5
*/
@@ -126,16 +126,14 @@ function modChrome_outline($module, &$params, &$attribs)
if (!$css)
{
$css = true;
-
- jimport('joomla.environment.browser');
-
$doc = JFactory::getDocument();
- $browser = JBrowser::getInstance();
+ $client = JFactory::getApplication()->client;
+
$doc->addStyleDeclaration(".mod-preview-info { padding: 2px 4px 2px 4px; border: 1px solid black; position: absolute; background-color: white; color: red;}");
$doc->addStyleDeclaration(".mod-preview-wrapper { background-color:#eee; border: 1px dotted black; color:#700;}");
- if ($browser->getBrowser() === 'msie')
+ if ($client->browser === JApplicationWebClient::IE && version_compare($client->browserVersion, '9.0', '<'))
{
- if ($browser->getMajor() <= 7)
+ if (version_compare($client->browserVersion, '7.0', '<='))
{
$doc->addStyleDeclaration(".mod-preview-info {filter: alpha(opacity=80);}");
$doc->addStyleDeclaration(".mod-preview-wrapper {filter: alpha(opacity=50);}");
View
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
Oops, something went wrong.

0 comments on commit e9e6e68

Please sign in to comment.