Permalink
Browse files

Merge Conflicts

  • Loading branch information...
1 parent 7901c01 commit 8f4b90402a3606ed65d519b3dbda1a0de4667a68 @Buddhima Buddhima committed Aug 28, 2013
Showing 1,205 changed files with 9,766 additions and 6,073 deletions.
View
@@ -16,3 +16,4 @@
# Test Related Files #
/phpunit.xml
+/tests/system/webdriver/tests/logs/
View
@@ -5,6 +5,7 @@ php:
- 5.4
before_script:
+ - composer self-update
- pyrus channel-discover pear.phpunit.de
- pyrus install --force phpunit/DbUnit
- phpenv rehash
View
@@ -1,6 +1,11 @@
-Joomla! CMS [![Build Status](https://travis-ci.org/joomla/joomla-cms.png)](https://travis-ci.org/joomla/joomla-cms)
+Joomla! CMS
====================
+Build Status
+---------------------
+Travis-CI: [![Build Status](https://travis-ci.org/joomla/joomla-cms.png)](https://travis-ci.org/joomla/joomla-cms)
+Jenkins: [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://build.joomla.org/job/cms/)
+
What is this?
---------------------
* This is a Joomla! installation/upgrade package to version 3.x
@@ -540,6 +540,7 @@ public function deleteUnexistingFiles()
'/media/plg_quickicon_extensionupdate/extensionupdatecheck.js',
'/media/plg_quickicon_joomlaupdate/jupdatecheck.js',
// Joomla! 3.1
+ '/libraries/joomla/application/router.php',
'/libraries/joomla/form/rules/boolean.php',
'/libraries/joomla/form/rules/color.php',
'/libraries/joomla/form/rules/email.php',
@@ -592,6 +593,10 @@ public function deleteUnexistingFiles()
'/libraries/legacy/html/contentlanguage.php',
'/libraries/legacy/html/index.html',
'/libraries/legacy/html/menu.php',
+ '/libraries/legacy/menu/index.html',
+ '/libraries/legacy/menu/menu.php',
+ '/libraries/legacy/pathway/index.html',
+ '/libraries/legacy/pathway/pathway.php',
'/media/system/css/mooRainbow.css',
'/media/system/js/mooRainbow-uncompressed.js',
'/media/system/js/mooRainbow.js',
@@ -650,6 +655,8 @@ public function deleteUnexistingFiles()
'/libraries/joomla/installer',
'/libraries/joomla/pagination',
'/libraries/legacy/html',
+ '/libraries/legacy/menu',
+ '/libraries/legacy/pathway',
'/media/system/swf/',
);
@@ -1,3 +1,4 @@
+# Placeholder file for database changes for version 3.2.0
INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES
(36, 1, 69, 70, 1, 'com_services', 'com_services', '{}');
@@ -1 +1 @@
-ALTER TABLE "#__associations" ALTER COLUMN id TYPE INT(11);
+ALTER TABLE "#__associations" ALTER COLUMN id TYPE integer;
@@ -1,3 +1,4 @@
+# Placeholder file for database changes for version 3.2.0
INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "title", "rules") VALUES
(36,1,69,70,1, 'com_services', 'com_services', '{}');
@@ -1,3 +1,4 @@
+# Placeholder file for database changes for version 3.2.0
SET IDENTITY_INSERT #__assets ON;
INSERT INTO #__assets (id,parent_id,lft,rgt,level,name,title,rules)
@@ -12,4 +13,4 @@ SELECT 30, 'com_services', 'component', 'com_services', '', 1, 1, 0, 0, '{"name"
UNION ALL
SELECT 318, 'mod_admin_services', 'module', 'mod_admin_services', '', 0, 1, 0, 0, '{"name":"mod_admin_services","type":"module","creationDate":"June 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights\n\t\treserved.\n\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"MOD_ADMIN_SERVICES_XML_DESCRIPTION","group":""}', '{"config_visible":"1"}', '', '', 0, '1900-01-01 00:00:00', 0, 0;
-SET IDENTITY_INSERT #__extensions OFF;
+SET IDENTITY_INSERT #__extensions OFF;
@@ -14,7 +14,7 @@
<?php foreach ($fieldSets as $name => $fieldSet) : ?>
<?php $label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CATEGORIES_' . $name . '_FIELDSET_LABEL'; ?>
<?php if ($name != 'editorConfig' && $name != 'basic-limited') : ?>
- <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'attrib-' . $name, trim($label)); ?>
+ <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'attrib-' . $name, JText::_(trim($label))); ?>
<fieldset>
<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
<p class="tip"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package Joomla.Administrator
+ * @subpackage com_config
+ *
+ * @copyright Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Controller for global configuration
+ *
+ * @package Joomla.Administrator
+ * @subpackage com_config
+ * @since 3.2
+ */
+class ConfigControllerApplication extends JControllerLegacy
+{
+ /**
+ * Returns the updated options for help site selector
+ *
+ * @return void
+ *
+ * @since 3.2
+ * @throws Exception
+ */
+ public function refreshHelp()
+ {
+ jimport('joomla.filesystem.file');
+
+ // Set FTP credentials, if given
+ JClientHelper::setCredentialsFromRequest('ftp');
+
+ if (($data = file_get_contents('http://update.joomla.org/helpsites/helpsites.xml')) === false)
+ {
+ throw new Exception(JText::_('COM_CONFIG_ERROR_HELPREFRESH_FETCH'), 500);
+ }
+ elseif (!JFile::write(JPATH_BASE . '/help/helpsites.xml', $data))
+ {
+ throw new Exception(JText::_('COM_CONFIG_ERROR_HELPREFRESH_ERROR_STORE'), 500);
+ }
+
+ if ($this->input->get('format') == 'json')
+ {
+ $options = JHelp::createSiteList(JPATH_ADMINISTRATOR . '/help/helpsites.xml');
+ echo json_encode($options);
+ JFactory::getApplication()->close();
+ }
+ }
+}
@@ -80,7 +80,9 @@ public function refreshHelp()
include_once JPATH_ADMINISTRATOR . '/components/com_config/controller/application/refreshhelp.php';
$controller = new ConfigControllerApplicationRefreshhelp;
+
$controller->execute();
+
}
/**
@@ -20,3 +20,4 @@
JLog::add('models/ConfigModelComponent is deprecated. Use model/ConfigModelComponent instead.', JLog::WARNING, 'deprecated');
include_once JPATH_ADMINISTRATOR . '/components/com_config/model/component.php';
+
@@ -30,6 +30,7 @@ class JFormFieldModal_Contact extends JFormField
* Method to get the field input markup.
*
* @return string The field input markup.
+ *
* @since 1.6
*/
protected function getInput()
@@ -49,18 +50,18 @@ protected function getInput()
$script = array();
// Select button script
- $script[] = ' function jSelectContact_'.$this->id.'(id, name, object) {';
- $script[] = ' document.id("'.$this->id.'_id").value = id;';
- $script[] = ' document.id("'.$this->id.'_name").value = name;';
+ $script[] = ' function jSelectContact_' . $this->id . '(id, name, object) {';
+ $script[] = ' document.id("' . $this->id . '_id").value = id;';
+ $script[] = ' document.id("' . $this->id . '_name").value = name;';
if ($allowEdit)
{
- $script[] = ' jQuery("#'.$this->id.'_edit").removeClass("hidden");';
+ $script[] = ' jQuery("#' . $this->id . '_edit").removeClass("hidden");';
}
if ($allowClear)
{
- $script[] = ' jQuery("#'.$this->id.'_clear").removeClass("hidden");';
+ $script[] = ' jQuery("#' . $this->id . '_clear").removeClass("hidden");';
}
$script[] = ' SqueezeBox.close();';
@@ -89,20 +90,20 @@ protected function getInput()
// Setup variables for display.
$html = array();
- $link = 'index.php?option=com_contact&amp;view=contacts&amp;layout=modal&amp;tmpl=component&amp;function=jSelectContact_'.$this->id;
+ $link = 'index.php?option=com_contact&amp;view=contacts&amp;layout=modal&amp;tmpl=component&amp;function=jSelectContact_' . $this->id;
if (isset($this->element['language']))
{
- $link .= '&amp;forcedLanguage='.$this->element['language'];
+ $link .= '&amp;forcedLanguage=' . $this->element['language'];
}
// Get the title of the linked chart
$db = JFactory::getDbo();
- $db->setQuery(
- 'SELECT name' .
- ' FROM #__contact_details' .
- ' WHERE id = '.(int) $this->value
- );
+ $query = $db->getQuery(true)
+ ->select($db->quoteName('name'))
+ ->from($db->quoteName('#__contact_details'))
+ ->where('id = ' . (int) $this->value);
+ $db->setQuery($query);
try
{
@@ -117,6 +118,7 @@ protected function getInput()
{
$title = JText::_('COM_CONTACT_SELECT_A_CONTACT');
}
+
$title = htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
// The active contact id field.
@@ -131,31 +133,32 @@ protected function getInput()
// The current contact display field.
$html[] = '<span class="input-append">';
- $html[] = '<input type="text" class="input-medium" id="'.$this->id.'_name" value="'.$title.'" disabled="disabled" size="35" />';
- $html[] = '<a class="modal btn hasTooltip" title="'.JHtml::tooltipText('COM_CONTACT_CHANGE_CONTACT').'" href="'.$link.'&amp;'.JSession::getFormToken().'=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}"><i class="icon-file"></i> '.JText::_('JSELECT').'</a>';
+ $html[] = '<input type="text" class="input-medium" id="' . $this->id . '_name" value="' . $title . '" disabled="disabled" size="35" />';
+ $html[] = '<a class="modal btn hasTooltip" title="' . JHtml::tooltipText('COM_CONTACT_CHANGE_CONTACT') . '" href="' . $link . '&amp;' . JSession::getFormToken() . '=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}"><i class="icon-file"></i> ' . JText::_('JSELECT') . '</a>';
// Edit article button
if ($allowEdit)
{
- $html[] = '<a class="btn hasTooltip'.($value ? '' : ' hidden').'" href="index.php?option=com_contact&layout=modal&tmpl=component&task=contact.edit&id=' . $value. '" target="_blank" title="'.JHtml::tooltipText('COM_CONTACT_EDIT_CONTACT').'" ><span class="icon-edit"></span> ' . JText::_('JACTION_EDIT') . '</a>';
+ $html[] = '<a class="btn hasTooltip' . ($value ? '' : ' hidden') . '" href="index.php?option=com_contact&layout=modal&tmpl=component&task=contact.edit&id=' . $value . '" target="_blank" title="' . JHtml::tooltipText('COM_CONTACT_EDIT_CONTACT') . '" ><span class="icon-edit"></span> ' . JText::_('JACTION_EDIT') . '</a>';
}
// Clear contact button
if ($allowClear)
{
- $html[] = '<button id="'.$this->id.'_clear" class="btn'.($value ? '' : ' hidden').'" onclick="return jClearContact(\''.$this->id.'\')"><span class="icon-remove"></span> ' . JText::_('JCLEAR') . '</button>';
+ $html[] = '<button id="' . $this->id . '_clear" class="btn' . ($value ? '' : ' hidden') . '" onclick="return jClearContact(\'' . $this->id . '\')"><span class="icon-remove"></span> ' . JText::_('JCLEAR') . '</button>';
}
$html[] = '</span>';
// class='required' for client side validation
$class = '';
+
if ($this->required)
{
$class = ' class="required modal-value"';
}
- $html[] = '<input type="hidden" id="'.$this->id.'_id"'.$class.' name="'.$this->name.'" value="'.$value.'" />';
+ $html[] = '<input type="hidden" id="' . $this->id . '_id"' . $class . ' name="' . $this->name . '" value="' . $value . '" />';
return implode("\n", $html);
}
@@ -405,7 +405,6 @@ public static function getContentPath($url)
// Only get the router once.
if (!($router instanceof JRouter))
{
- jimport('joomla.application.router');
include_once JPATH_SITE . '/includes/application.php';
// Get and configure the site router.
@@ -375,7 +375,7 @@ protected function tokenizeToDB($input, $context, $lang, $format)
// Check if we're approaching the memory limit of the token table.
if ($count > self::$state->options->get('memory_table_limit', 30000))
{
- self::toggleTables(false);
+ $this->toggleTables(false);
}
unset($string);
@@ -430,7 +430,7 @@ protected function tokenizeToDB($input, $context, $lang, $format)
// Check if we're approaching the memory limit of the token table.
if ($count > self::$state->options->get('memory_table_limit', 30000))
{
- self::toggleTables(false);
+ $this->toggleTables(false);
}
}
}
@@ -57,15 +57,19 @@ public function upload()
{
return false;
}
- if (
- $_SERVER['CONTENT_LENGTH'] > ($params->get('upload_maxsize', 0) * 1024 * 1024) ||
- $_SERVER['CONTENT_LENGTH'] > (int) (ini_get('upload_max_filesize')) * 1024 * 1024 ||
- $_SERVER['CONTENT_LENGTH'] > (int) (ini_get('post_max_size')) * 1024 * 1024 ||
- (($_SERVER['CONTENT_LENGTH'] > (int) (ini_get('memory_limit')) * 1024 * 1024) && ((int) (ini_get('memory_limit')) != -1))
- )
+
+ if (($params->get('upload_maxsize', 0) * 1024 * 1024) != 0)
{
- JError::raiseWarning(100, JText::_('COM_MEDIA_ERROR_WARNFILETOOLARGE'));
- return false;
+ if (
+ $_SERVER['CONTENT_LENGTH'] > ($params->get('upload_maxsize', 0) * 1024 * 1024)
+ || $_SERVER['CONTENT_LENGTH'] > (int) (ini_get('upload_max_filesize')) * 1024 * 1024
+ || $_SERVER['CONTENT_LENGTH'] > (int) (ini_get('post_max_size')) * 1024 * 1024
+ || (($_SERVER['CONTENT_LENGTH'] > (int) (ini_get('memory_limit')) * 1024 * 1024) && ((int) (ini_get('memory_limit')) != -1))
+ )
+ {
+ JError::raiseWarning(100, JText::_('COM_MEDIA_ERROR_WARNFILETOOLARGE'));
+ return false;
+ }
}
// Perform basic checks on file info before attempting anything
@@ -80,7 +84,7 @@ public function upload()
return false;
}
- if ($file['size'] > ($params->get('upload_maxsize', 0) * 1024 * 1024))
+ if (($params->get('upload_maxsize', 0) * 1024 * 1024) != 0 && $file['size'] > ($params->get('upload_maxsize', 0) * 1024 * 1024))
{
JError::raiseNotice(100, JText::_('COM_MEDIA_ERROR_WARNFILETOOLARGE'));
return false;
@@ -113,8 +117,8 @@ public function upload()
if (!MediaHelper::canUpload($file, $err))
{
- // The file can't be upload
- JError::raiseNotice(100, JText::_($err));
+ // The file can't be uploaded
+
return false;
}
Oops, something went wrong.

0 comments on commit 8f4b904

Please sign in to comment.