diff --git a/administrator/templates/hathor/html/com_weblinks/weblinks/default.php b/administrator/templates/hathor/html/com_weblinks/weblinks/default.php index 2a72f77dc41d5..cbbc87030e2de 100644 --- a/administrator/templates/hathor/html/com_weblinks/weblinks/default.php +++ b/administrator/templates/hathor/html/com_weblinks/weblinks/default.php @@ -179,11 +179,7 @@ hits; ?>
get('admin_menus') != '0') : ?>
+
diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index 01cc78895d83a..bd2b0dbe7c6f6 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -183,6 +183,7 @@ function colorIsLight($color)
' . JStringPunycode::urlToUTF8($profile->text) . ' ';
else :
echo '' . JStringPunycode::urlToUTF8($profile->text) . ' ';
endif;
break;
- case "profile_dob":
+ case 'profile_dob':
echo '' . JHtml::_('date', $profile->text, JText::_('DATE_FORMAT_LC4'), false) . ' ';
break;
diff --git a/components/com_contact/views/contact/view.html.php b/components/com_contact/views/contact/view.html.php
index 6c645bba4aea4..80e347ef52edd 100644
--- a/components/com_contact/views/contact/view.html.php
+++ b/components/com_contact/views/contact/view.html.php
@@ -138,12 +138,12 @@ public function display($tpl = null)
{
case 1 :
// Text
- $params->set('marker_address', JText::_('COM_CONTACT_ADDRESS') . ": ");
- $params->set('marker_email', JText::_('JGLOBAL_EMAIL') . ": ");
- $params->set('marker_telephone', JText::_('COM_CONTACT_TELEPHONE') . ": ");
- $params->set('marker_fax', JText::_('COM_CONTACT_FAX') . ": ");
- $params->set('marker_mobile', JText::_('COM_CONTACT_MOBILE') . ": ");
- $params->set('marker_misc', JText::_('COM_CONTACT_OTHER_INFORMATION') . ": ");
+ $params->set('marker_address', JText::_('COM_CONTACT_ADDRESS') . ': ');
+ $params->set('marker_email', JText::_('JGLOBAL_EMAIL') . ': ');
+ $params->set('marker_telephone', JText::_('COM_CONTACT_TELEPHONE') . ': ');
+ $params->set('marker_fax', JText::_('COM_CONTACT_FAX') . ': ');
+ $params->set('marker_mobile', JText::_('COM_CONTACT_MOBILE') . ': ');
+ $params->set('marker_misc', JText::_('COM_CONTACT_OTHER_INFORMATION') . ': ');
$params->set('marker_class', 'jicons-text');
break;
@@ -161,60 +161,60 @@ public function display($tpl = null)
default :
if ($params->get('icon_address'))
{
- $image1 = JHtml::_('image', $params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS') . ": ", null, false);
+ $image1 = JHtml::_('image', $params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS') . ': ', null, false);
}
else
{
- $image1 = JHtml::_('image', 'contacts/' . $params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS') . ": ", null, true);
+ $image1 = JHtml::_('image', 'contacts/' . $params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS') . ': ', null, true);
}
if ($params->get('icon_email'))
{
- $image2 = JHtml::_('image', $params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL') . ": ", null, false);
+ $image2 = JHtml::_('image', $params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL') . ': ', null, false);
}
else
{
- $image2 = JHtml::_('image', 'contacts/' . $params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL') . ": ", null, true);
+ $image2 = JHtml::_('image', 'contacts/' . $params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL') . ': ', null, true);
}
if ($params->get('icon_telephone'))
{
- $image3 = JHtml::_('image', $params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE') . ": ", null, false);
+ $image3 = JHtml::_('image', $params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE') . ': ', null, false);
}
else
{
- $image3 = JHtml::_('image', 'contacts/' . $params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE') . ": ", null, true);
+ $image3 = JHtml::_('image', 'contacts/' . $params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE') . ': ', null, true);
}
if ($params->get('icon_fax'))
{
- $image4 = JHtml::_('image', $params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX') . ": ", null, false);
+ $image4 = JHtml::_('image', $params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX') . ': ', null, false);
}
else
{
- $image4 = JHtml::_('image', 'contacts/' . $params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX') . ": ", null, true);
+ $image4 = JHtml::_('image', 'contacts/' . $params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX') . ': ', null, true);
}
if ($params->get('icon_misc'))
{
- $image5 = JHtml::_('image', $params->get('icon_misc', 'con_info.png'), JText::_('COM_CONTACT_OTHER_INFORMATION') . ": ", null, false);
+ $image5 = JHtml::_('image', $params->get('icon_misc', 'con_info.png'), JText::_('COM_CONTACT_OTHER_INFORMATION') . ': ', null, false);
}
else
{
$image5 = JHtml::_(
'image',
'contacts/' . $params->get('icon_misc', 'con_info.png'),
- JText::_('COM_CONTACT_OTHER_INFORMATION') . ": ", null, true
+ JText::_('COM_CONTACT_OTHER_INFORMATION') . ': ', null, true
);
}
if ($params->get('icon_mobile'))
{
- $image6 = JHtml::_('image', $params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE') . ": ", null, false);
+ $image6 = JHtml::_('image', $params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE') . ': ', null, false);
}
else
{
- $image6 = JHtml::_('image', 'contacts/' . $params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE') . ": ", null, true);
+ $image6 = JHtml::_('image', 'contacts/' . $params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE') . ': ', null, true);
}
$params->set('marker_address', $image1);
@@ -344,7 +344,7 @@ protected function _prepareDocument()
$id = (int) @$menu->query['id'];
// If the menu item does not concern this contact
- if ($menu && ($menu->query['option'] != 'com_contact' || $menu->query['view'] != 'contact' || $id != $this->item->id))
+ if ($menu && ($menu->query['option'] !== 'com_contact' || $menu->query['view'] !== 'contact' || $id != $this->item->id))
{
// If this is not a single contact menu item, set the page title to the contact title
if ($this->item->name)
@@ -355,7 +355,7 @@ protected function _prepareDocument()
$path = array(array('title' => $this->contact->name, 'link' => ''));
$category = JCategories::getInstance('Contact')->get($this->contact->catid);
- while ($category && ($menu->query['option'] != 'com_contact' || $menu->query['view'] == 'contact' || $id != $category->id) && $category->id > 1)
+ while ($category && ($menu->query['option'] !== 'com_contact' || $menu->query['view'] === 'contact' || $id != $category->id) && $category->id > 1)
{
$path[] = array('title' => $category->title, 'link' => ContactHelperRoute::getCategoryRoute($this->contact->catid));
$category = $category->getParent();
diff --git a/components/com_contact/views/featured/tmpl/default_items.php b/components/com_contact/views/featured/tmpl/default_items.php
index 0e5d96a2a2086..04654ae96441b 100644
--- a/components/com_contact/views/featured/tmpl/default_items.php
+++ b/components/com_contact/views/featured/tmpl/default_items.php
@@ -95,7 +95,7 @@
items as $i => $item) : ?>
- " itemscope itemtype="https://schema.org/Person">
+
diff --git a/components/com_contact/views/featured/view.html.php b/components/com_contact/views/featured/view.html.php
index 3c815cde3d26f..4df2786df1949 100644
--- a/components/com_contact/views/featured/view.html.php
+++ b/components/com_contact/views/featured/view.html.php
@@ -96,9 +96,7 @@ public function display($tpl = null)
{
$item = &$items[$i];
$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
- $temp = new Registry;
-
- $temp->loadString($item->params);
+ $temp = new Registry($item->params);
$item->params = clone $params;
$item->params->merge($temp);
diff --git a/components/com_content/content.php b/components/com_content/content.php
index cea6490d5e16c..850b1ba40fd98 100644
--- a/components/com_content/content.php
+++ b/components/com_content/content.php
@@ -18,7 +18,7 @@
if ($input->get('view') === 'article' && $input->get('layout') === 'pagebreak')
{
- if (!$user->authorise('core.edit', 'com_content'))
+ if (!$user->authorise('core.create', 'com_content'))
{
JFactory::getApplication()->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
@@ -27,7 +27,7 @@
}
elseif ($input->get('view') === 'articles' && $input->get('layout') === 'modal')
{
- if (!$user->authorise('core.edit', 'com_content'))
+ if (!$user->authorise('core.create', 'com_content'))
{
JFactory::getApplication()->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
@@ -36,5 +36,5 @@
}
$controller = JControllerLegacy::getInstance('Content');
-$controller->execute($input->get('task'));
+$controller->execute(JFactory::getApplication()->input->get('task'));
$controller->redirect();
diff --git a/components/com_content/models/article.php b/components/com_content/models/article.php
index b72a4de0a3b40..e944c87ab59e8 100644
--- a/components/com_content/models/article.php
+++ b/components/com_content/models/article.php
@@ -170,15 +170,12 @@ public function getItem($pk = null)
}
// Convert parameter fields to objects.
- $registry = new Registry;
- $registry->loadString($data->attribs);
+ $registry = new Registry($data->attribs);
$data->params = clone $this->getState('params');
$data->params->merge($registry);
- $registry = new Registry;
- $registry->loadString($data->metadata);
- $data->metadata = $registry;
+ $data->metadata = new Registry($data->metadata);
// Technically guest could edit an article, but lets not check that to improve performance a little.
if (!$user->get('guest'))
diff --git a/components/com_content/models/articles.php b/components/com_content/models/articles.php
index d9224c42bba06..1b9652b00323d 100644
--- a/components/com_content/models/articles.php
+++ b/components/com_content/models/articles.php
@@ -580,8 +580,7 @@ public function getItems()
// Convert the parameter fields into objects.
foreach ($items as &$item)
{
- $articleParams = new Registry;
- $articleParams->loadString($item->attribs);
+ $articleParams = new Registry($item->attribs);
// Unpack readmore and layout params
$item->alternative_readmore = $articleParams->get('alternative_readmore');
@@ -620,8 +619,7 @@ public function getItems()
// Merge the selected article params
if (count($articleArray) > 0)
{
- $articleParams = new Registry;
- $articleParams->loadArray($articleArray);
+ $articleParams = new Registry($articleArray);
$item->params->merge($articleParams);
}
}
diff --git a/components/com_content/models/form.php b/components/com_content/models/form.php
index c39be47a16b08..f8301e312381d 100644
--- a/components/com_content/models/form.php
+++ b/components/com_content/models/form.php
@@ -87,8 +87,7 @@ public function getItem($itemId = null)
$value = ArrayHelper::toObject($properties, 'JObject');
// Convert attrib field to Registry.
- $value->params = new Registry;
- $value->params->loadString($value->attribs);
+ $value->params = new Registry($value->attribs);
// Compute selected asset permissions.
$user = JFactory::getUser();
@@ -141,8 +140,7 @@ public function getItem($itemId = null)
}
// Convert the metadata field to an array.
- $registry = new Registry;
- $registry->loadString($value->metadata);
+ $registry = new Registry($value->metadata);
$value->metadata = $registry->toArray();
if ($itemId)
diff --git a/components/com_content/router.php b/components/com_content/router.php
index 351b14cc3668f..3abd5d0266ac9 100644
--- a/components/com_content/router.php
+++ b/components/com_content/router.php
@@ -20,7 +20,7 @@ class ContentRouter extends JComponentRouterView
/**
* Content Component router constructor
- *
+ *
* @param JApplicationCms $app The application object
* @param JMenu $menu The menu object to work with
*/
@@ -54,14 +54,14 @@ public function __construct($app = null, $menu = null)
}
else
{
- require_once JPATH_SITE . '/components/com_content/helpers/legacyrouter.php';
+ JLoader::register('ContentRouterRulesLegacy', __DIR__ . '/helpers/legacyrouter.php');
$this->attachRule(new ContentRouterRulesLegacy($this));
}
}
/**
* Method to get the segment(s) for a category
- *
+ *
* @param string $id ID of the category to retrieve the segments for
* @param array $query The request that is build right now
*
@@ -94,7 +94,7 @@ public function getCategorySegment($id, $query)
/**
* Method to get the segment(s) for a category
- *
+ *
* @param string $id ID of the category to retrieve the segments for
* @param array $query The request that is build right now
*
@@ -107,7 +107,7 @@ public function getCategoriesSegment($id, $query)
/**
* Method to get the segment(s) for an article
- *
+ *
* @param string $id ID of the article to retrieve the segments for
* @param array $query The request that is build right now
*
@@ -141,7 +141,7 @@ public function getArticleSegment($id, $query)
/**
* Method to get the id for a category
- *
+ *
* @param string $segment Segment to retrieve the ID for
* @param array $query The request that is parsed right now
*
@@ -177,10 +177,10 @@ public function getCategoryId($segment, $query)
/**
* Method to get the segment(s) for a category
- *
+ *
* @param string $segment Segment to retrieve the ID for
* @param array $query The request that is parsed right now
- *
+ *
* @return mixed The id of this item or false
*/
public function getCategoriesId($segment, $query)
@@ -190,10 +190,10 @@ public function getCategoriesId($segment, $query)
/**
* Method to get the segment(s) for an article
- *
+ *
* @param string $segment Segment of the article to retrieve the ID for
* @param array $query The request that is parsed right now
- *
+ *
* @return mixed The id of this item or false
*/
public function getArticleId($segment, $query)
diff --git a/components/com_finder/helpers/html/filter.php b/components/com_finder/helpers/html/filter.php
index 800598f2d0746..a2f24c8f73bc9 100644
--- a/components/com_finder/helpers/html/filter.php
+++ b/components/com_finder/helpers/html/filter.php
@@ -66,9 +66,7 @@ public static function slider($options = array())
// Initialize the filter parameters.
if ($filter)
{
- $registry = new Registry;
- $registry->loadString($filter->params);
- $filter->params = $registry;
+ $filter->params = new Registry($filter->params);
}
}
@@ -255,9 +253,7 @@ public static function select($idxQuery, $options)
// Initialize the filter parameters.
if ($filter)
{
- $registry = new Registry;
- $registry->loadString($filter->params);
- $filter->params = $registry;
+ $filter->params = new Registry($filter->params);
}
}
diff --git a/components/com_finder/views/search/tmpl/default.xml b/components/com_finder/views/search/tmpl/default.xml
index 053ce8f45ad5c..ce5a6784a579d 100644
--- a/components/com_finder/views/search/tmpl/default.xml
+++ b/components/com_finder/views/search/tmpl/default.xml
@@ -126,7 +126,7 @@
@@ -136,7 +136,7 @@
diff --git a/components/com_modules/modules.php b/components/com_modules/modules.php
index e88cad8a34ea5..e71b22770455d 100644
--- a/components/com_modules/modules.php
+++ b/components/com_modules/modules.php
@@ -16,6 +16,16 @@
$lang->load('joomla', JPATH_ADMINISTRATOR);
$lang->load('com_modules', JPATH_ADMINISTRATOR);
+if ($app->input->get('view') === 'modules' && $app->input->get('layout') === 'modal')
+{
+ if (!JFactory::getUser()->authorise('core.create', 'com_modules'))
+ {
+ $app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+
+ return;
+ }
+}
+
if ($app->input->get('task') === 'module.orderPosition')
{
$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
diff --git a/components/com_newsfeeds/models/newsfeed.php b/components/com_newsfeeds/models/newsfeed.php
index f5a7e93703a43..0b85d31983afc 100644
--- a/components/com_newsfeeds/models/newsfeed.php
+++ b/components/com_newsfeeds/models/newsfeed.php
@@ -133,14 +133,11 @@ public function &getItem($pk = null)
}
// Convert parameter fields to objects.
- $registry = new Registry;
- $registry->loadString($data->params);
+ $registry = new Registry($data->params);
$data->params = clone $this->getState('params');
$data->params->merge($registry);
- $registry = new Registry;
- $registry->loadString($data->metadata);
- $data->metadata = $registry;
+ $data->metadata = new Registry($data->metadata);
// Compute access permissions.
diff --git a/components/com_newsfeeds/router.php b/components/com_newsfeeds/router.php
index 81b1d0ed60f50..e2dc64728225f 100644
--- a/components/com_newsfeeds/router.php
+++ b/components/com_newsfeeds/router.php
@@ -20,7 +20,7 @@ class NewsfeedsRouter extends JComponentRouterView
/**
* Newsfeeds Component router constructor
- *
+ *
* @param JApplicationCms $app The application object
* @param JMenu $menu The menu object to work with
*/
@@ -51,14 +51,14 @@ public function __construct($app = null, $menu = null)
}
else
{
- require_once JPATH_SITE . '/components/com_newsfeeds/helpers/legacyrouter.php';
+ JLoader::register('NewsfeedsRouterRulesLegacy', __DIR__ . '/helpers/legacyrouter.php');
$this->attachRule(new NewsfeedsRouterRulesLegacy($this));
}
}
/**
* Method to get the segment(s) for a category
- *
+ *
* @param string $id ID of the category to retrieve the segments for
* @param array $query The request that is build right now
*
@@ -90,7 +90,7 @@ public function getCategorySegment($id, $query)
/**
* Method to get the segment(s) for a category
- *
+ *
* @param string $id ID of the category to retrieve the segments for
* @param array $query The request that is build right now
*
@@ -103,7 +103,7 @@ public function getCategoriesSegment($id, $query)
/**
* Method to get the segment(s) for a newsfeed
- *
+ *
* @param string $id ID of the newsfeed to retrieve the segments for
* @param array $query The request that is build right now
*
@@ -137,7 +137,7 @@ public function getNewsfeedSegment($id, $query)
/**
* Method to get the id for a category
- *
+ *
* @param string $segment Segment to retrieve the ID for
* @param array $query The request that is parsed right now
*
@@ -173,10 +173,10 @@ public function getCategoryId($segment, $query)
/**
* Method to get the segment(s) for a category
- *
+ *
* @param string $segment Segment to retrieve the ID for
* @param array $query The request that is parsed right now
- *
+ *
* @return mixed The id of this item or false
*/
public function getCategoriesId($segment, $query)
@@ -186,10 +186,10 @@ public function getCategoriesId($segment, $query)
/**
* Method to get the segment(s) for a newsfeed
- *
+ *
* @param string $segment Segment of the newsfeed to retrieve the ID for
* @param array $query The request that is parsed right now
- *
+ *
* @return mixed The id of this item or false
*/
public function getNewsfeedId($segment, $query)
diff --git a/components/com_newsfeeds/views/category/view.html.php b/components/com_newsfeeds/views/category/view.html.php
index e7cb3ea0773ce..c8bf962946761 100644
--- a/components/com_newsfeeds/views/category/view.html.php
+++ b/components/com_newsfeeds/views/category/view.html.php
@@ -52,8 +52,7 @@ public function display($tpl = null)
foreach ($this->items as $item)
{
$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
- $temp = new Registry;
- $temp->loadString($item->params);
+ $temp = new Registry($item->params);
$item->params = clone $this->params;
$item->params->merge($temp);
}
diff --git a/components/com_newsfeeds/views/newsfeed/view.html.php b/components/com_newsfeeds/views/newsfeed/view.html.php
index 62bef98f4cfe6..ae163264506ed 100644
--- a/components/com_newsfeeds/views/newsfeed/view.html.php
+++ b/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -153,8 +153,7 @@ public function display($tpl = null)
// Get the newsfeed
$newsfeed = $item;
- $temp = new Registry;
- $temp->loadString($item->params);
+ $temp = new Registry($item->params);
$params->merge($temp);
try
@@ -185,15 +184,15 @@ public function display($tpl = null)
// Escape strings for HTML output
$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
- $this->assignRef('params', $params);
- $this->assignRef('newsfeed', $newsfeed);
- $this->assignRef('state', $state);
- $this->assignRef('item', $item);
- $this->assignRef('user', $user);
+ $this->params = $params;
+ $this->newsfeed = $newsfeed;
+ $this->state = $state;
+ $this->item = $item;
+ $this->user = $user;
if (!empty($msg))
{
- $this->assignRef('msg', $msg);
+ $this->msg = $msg;
}
$this->print = $print;
diff --git a/components/com_search/views/search/view.html.php b/components/com_search/views/search/view.html.php
index b2f0b5616d4e7..1859fa8d636c1 100644
--- a/components/com_search/views/search/view.html.php
+++ b/components/com_search/views/search/view.html.php
@@ -49,8 +49,7 @@ public function display($tpl = null)
// Because the application sets a default page title, we need to get it right from the menu item itself
if (is_object($menu))
{
- $menu_params = new Registry;
- $menu_params->loadString($menu->params);
+ $menu_params = new Registry($menu->params);
if (!$menu_params->get('page_title'))
{
diff --git a/components/com_tags/views/tag/view.html.php b/components/com_tags/views/tag/view.html.php
index 973ea6abcb9a0..faf4826270b41 100644
--- a/components/com_tags/views/tag/view.html.php
+++ b/components/com_tags/views/tag/view.html.php
@@ -76,8 +76,7 @@ public function display($tpl = null)
// Prepare the data.
if (!empty($itemElement))
{
- $temp = new Registry;
- $temp->loadString($itemElement->params);
+ $temp = new Registry($itemElement->params);
$itemElement->params = clone $params;
$itemElement->params->merge($temp);
$itemElement->params = (array) json_decode($itemElement->params);
diff --git a/components/com_tags/views/tags/view.html.php b/components/com_tags/views/tags/view.html.php
index 082465869c962..dc8a7d1e23725 100644
--- a/components/com_tags/views/tags/view.html.php
+++ b/components/com_tags/views/tags/view.html.php
@@ -68,8 +68,7 @@ public function display($tpl = null)
}
// Prepare the data.
- $temp = new Registry;
- $temp->loadString($itemElement->params);
+ $temp = new Registry($itemElement->params);
$itemElement->params = clone $params;
$itemElement->params->merge($temp);
$itemElement->params = (array) json_decode($itemElement->params);
diff --git a/components/com_users/controllers/user.php b/components/com_users/controllers/user.php
index 035866860c4f8..15e2d6a5ed340 100644
--- a/components/com_users/controllers/user.php
+++ b/components/com_users/controllers/user.php
@@ -217,7 +217,7 @@ public function logout()
/**
* Method to logout directly and redirect to page.
*
- * @return boolean
+ * @return void
*
* @since 3.5
*/
diff --git a/components/com_users/router.php b/components/com_users/router.php
index 61411937327d1..84d5d1c6740c1 100644
--- a/components/com_users/router.php
+++ b/components/com_users/router.php
@@ -18,7 +18,7 @@ class UsersRouter extends JComponentRouterView
{
/**
* Users Component router constructor
- *
+ *
* @param JApplicationCms $app The application object
* @param JMenu $menu The menu object to work with
*/
@@ -45,7 +45,7 @@ public function __construct($app = null, $menu = null)
}
else
{
- require_once JPATH_SITE . '/components/com_users/helpers/legacyrouter.php';
+ JLoader::register('UsersRouterRulesLegacy', __DIR__ . '/helpers/legacyrouter.php');
$this->attachRule(new UsersRouterRulesLegacy($this));
}
}
diff --git a/installation/CREDITS b/installation/CREDITS
index b054b564cf231..08baed9163eab 100644
--- a/installation/CREDITS
+++ b/installation/CREDITS
@@ -9,632 +9,10 @@
defined('_JEXEC') or die;
?>
------Please save file as UTF8
+-------------------- Joomla! Credits ---------------------
--------------------- Joomla! 1.6/1.7/2.5/3.x Credits ---------------------
+The current list of contributors is available on GitHub at:
+https://github.com/joomla/joomla-cms/graphs/contributors
-Code contributors:
-------------------
-Adrian Louter
-Adrian Victor III Onod
-Airton Torres
-Akarawuth Tamrareang
-Amy Stephen
-Andrea Tarr
-Andrew Eddie
-Andy Capiau
-Angie Radtke
-Anja Hage
-Anthony Ferrara
-Anthony McLin
-Antonio Escobar Tizon
-Artyom Bisyarin
-Benjamin Trenkle
-Bill Richardson
-Birger Lehner
-Boris Baddenoff
-Brian Teeman
-C. Tapuscrine
-Cherif Gouiaa
-Chris Davenport
-Christophe Demko
-Christopher Garvis
-Cristina Solana
-CY Lee
-Dennis Hermacki
-Elin Waring
-Ercan Ozkaya
-Franklin Tse
-Gergő Erdősi
-Gobezu Sewu
-Hannes Papenberg
-Harry Reinhardt
-Ian MacLennan
-Iszak Bryan
-Jacob Waisner
-Janich Rasmussen
-Jason Pettett
-Jean-Marie Simonet
-Jen Kramer
-Jennifer Marriott
-Jeremy Wilken
-Jonatas Braganca
-Jonnathan S. Lima
-Joseph LeBlanc
-Kevin Devine
-Klas BerliÄ
-Louis Landry
-Loyd Headrick
-Marijke Stuivenberg
-Marius van Rijnsoever
-Mark Dexter
-Martijn Maandag
-Mathavan Jeyadev
-Matt Thomas
-Michael Babker
-Navid Zeraati
-Nicholas Dionysopoulos
-Nikolai Plath
-Ole Bang Ottosen
-Omar Ramos
-Peter Osipof
-Phani Kalluri
-Phil Snell
-Prasit Gebsaap
-Radek Suski
-Ramindu Deshapriya
-Rob Joyce
-Rob Schley
-Robert Deutz
-Roland Dalmulder
-Ron Severdia
-Ronald de Vries
-Ronald Pijpers
-Rouven Weßling
-Rune Sjøen
-Samuel Moffatt
-Sander Potjer
-Selene Feigl
-Sergio Iglesias
-Stefania Gaianigo
-Steve Burge
-Sudhi Seshachala
-Thierry Bela
-Tim Plummer
-Tore Krudtaa
-Troy Hall
-Tudor Mazilu
-Viet Hoang Vu
-Zachary Draper.
-
-
-
-Documentation Contributors:
----------------------------
-
-
-
-
-Translation Contributors:
--------------------------
-Afrikaans (af-ZA) - Gerrit Hoekstra
-Albanian (sq-AL) - Blendi Kraja
-Arabic Unitag (ar-AA) - Arabic Unitag Translation Team - Mahmood Alhaj Kassem, dr.d.ashraf
-Azeri (az-AZ) - Azeri Translation team - Guluzade Farhad
-Bahasa Indonesia (id-ID) - Hanacaraka Team - Andy Sikumbang, Dwi Rianto
-Basque (eu-ES) - Oinatz Martin
-Belarusian (be-BY) - Dennis Hermacki
-Bosnian (bs-BA) - Bosnian Translation Team - Admir Agic
-Bulgarian (bg-BG) - Yuriy Boev, Mihail Semerdzhiev, Stefan Ilivanov
-Brazilian Portuguese (pt-BR) - Joomla! Brasil - FaBMak
-Catalan (ca-ES) - Catalan Translation Team - el_libre@tradu.cat
-Chinese Traditional (zh-TW) - Traditional Chinese Translation Team - Eddy Chang
-Chinese Simplified (zh-CN) - Simplified Chinese Translation Team - Jonathan Chang
-Croatian (hr-HR) - Croatian Translation Team - Hrvoje Jerkovic
-Czech (cs-CZ) - Czech Translation Team
-Danish (da-DK) - Danish Translation Team - Ronny Buelund, Mikael Winther, Ole Bang Ottosen
-Dutch (nl-NL) - Dutch Translation Team - Marijke Stuivenberg, Martijn Maandag, Marco Corrò
-English (en-AU) - AU Australian Translation Team - Leonard Fitzgerald
-English (en-US) - US English Translation Team - Leonard Fitzgerald
-Estonian (et-EE) - Estonian Translation Team - Rivo Zängov
-Flemish (nl-BE) - Dutch (BE) Translation Team - Frank Joris
-Finnish (fi-FI) - Finnish Translation Team - Joomla.fi
-French (fr-FR) - French Translation Team - joomla.fr
-Galician (gl-ES) - Galician Translation Team - damufo
-Georgian (ka-GE) - Georgian Translation Project - Manana Gedevanishvili
-German (de-DE)/(de-CH)/(de-AT) - J!German - Jan Erik Zassenhaus, Wolfgang Korn, Steffen Werner, Christian Reinhart
-Greek (el-GR) - Greek Joomla Community - Aris Ntatsis
-Gujarati (gu-IN) - Gujarati Translation Team - Ronak Bhagdev
-Hebrew (he-IL) - Hebrew Translation Team - Yair Lahav, Ofer Cohen
-Hungarian (hu-HU) - Magyar Joomla! Felhasznalok Nemzetkozi Egyesulete - Jozsef Tamas Herczeg, Annamaria Ban
-Italian (it-IT) - Italian Translation Team - Stefania Gaianigo, Alessandro Rossi
-Japanese (ja-JP) - Japanese Translation Team - Noriaki Koide, Hiroko Hirano
-Khmer (Cambodia) (km-KH) - Khmer Translation Team - Sovann Heng, Kunthea Thy, Vathana Savuth
-Korean (Republic of Korea) (ko-KR) - Kang Mingu
-Kurdish - Soranî (cbk-IQ) - Kurdish Soranî Translation team - Chalak s. Kareem
-Latvian (lv-LV) - Latvian Translation Team - Edgars Piruška, Aivars Ostrovskis
-Laotian (lo-LA) - Joomla LaiLao Team (LaoOpenSource) - Akarawuth Tamrareang , Viengsakhone phanthanousy , Outhai Saioudom
-Lithuanian (lt-LT) - Lithuanian Translation Team - Stasys Svabas
-Malay-Bahasa Melayu (ms-MY) - Malay Translation Team - Sam Suresh
-Macedonian (mk-MK) - Macedonian Translation Team - Ilija Iliev Strumjan
-Mongolian (mn-MN) - Mongolian Translation Team, Altansukh T.
-Norwegian Bokmål (nb-NO) - Joomla! i Norge - Rune Rasmussen, Roar Jystad, Jens-Christian Skibakk
-Norwegian Nynorsk (nn-NO) - Joomla! i Norge - Toyni Tobekk (based on nb-NO translations)
-Persian (fa-IR) - Persian Translation Team - Mohsen Firoozmandan, Joomla Farsi Team
-Polish (pl-PL) - Polskie Centrum Joomla!
-Portuguese (pt-BR) - Joomla! Brasil
-Portuguese (pt-PT) - Comunidade Joomla! Portugal - Paulo Izidoro
-Romanian (ro-RO) - Romanian Joomla! Community - Horia Negura, Lavinia Negura
-Russian (ru-RU) - Russian Translation Team (joomlaportal.ru) - Sergey Litvinov, Sergey Brovin, Alexey Brin
-Scottish Gaelic (gd-GB) - Scottish Gaelic Translation - Michael Bauer
-Serbian (sr-RS) and Serbian (sr-YU)- Joomla! Serbia team - Svetlana Zec, Nenad Antic, Marko Milenovic
-Slovak (sk-SK) - Slovak Translation Team - Peter Michnica
-Spanish (es-ES) - Spanish Translation Team - Gustavo Raúl Aragón, Rafael Gómez, Leonel Cantón.
-Swahili - East Africa (sw-KE) - Swahili Translation Team - Hassan Abdalla (Ayeko)
-Swedish (sv-SE) - Swedish Translation Team (SvenskJoomla!) - Sune Hultman, Olle Zettergren, Stefan Gagner, Christer Gerhardsson
-Syriac (sy-IQ) - East Syriac Translation Team - Pauls Dinka
-Tamil India (ta-IN) - Ilagnayeru 'MIG' Manickam, Elango Samy Manim
-Thai (th-TH) - Joomla LaiThai Team (JoomlaCorner) - Akarawuth Tamrareang , Supachai Teasakul
-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 ---------------------
-
-Code contributers:
-------------------
-Levis Bisson
-Blagovest Dachev
-Andrew Eddie
-Anthony Ferrara
-David Gall
-Gergo Erdosi
-Rey Gigataras
-Wilco Jansen
-Johan Janssens
-Alex Kempkens
-Jason Kendall
-Enno Klasing
-Mati Kochen
-Mateusz Kreszowiec
-Louis Landry
-Alan Langford
-Mickael Maison
-Rastin Mehr
-Andy Miller
-Samuel Moffatt
-Robin Muilwijk
-Hannes Pappenberg
-Toby Patterson
-Nur Aini Rakhmawati
-Emir Sakic
-Rob Schley
-Amy Stephen
-Marko Schmuck
-Airton Torres
-Jui-Yu Tsai (Ray)
-Charl van Niekerk
-Laurens Vanderput
-Elin Warring
-Arno Zijlstra
-
-Documentation Contributers:
----------------------------
-Leandro Bergantiños
-Michelle Bisson
-Chris Davenport
-Ian MacLennan
-Chad McKissick
-René Serradeil
-Andy Wallace
-
-Translation contributors:
--------------------------
-Albanian (sp-AL) - Blendi Kraja
-Arabic Algeria (ar-DZ) - Saber Bousba
-Basque (eu-ES) - Basque Translation Team (Basque Language School of Santurtzi) - Abel Camacho, Pedro Lonbide
-Belarusian (be-BY) - Dennis Hermacki
-Bengali (bn-BD) – Kamal Sikder
-Bulgarian (bg-BG) - Bulgarian Translation Team - Bultrans
-Catalan (ca-ES) - Catalan Translation Team - Damià Verger
-Chinese Simplified (zh-CN) - Johnathan Cheung
-Chinese Traditional (zh-TW) - Traditional Chinese Translation Team - Eddy Chang
-Croatian (hr-HR) - Croatian Translation Team - Klaudia B.
-Czech (cs-CZ) - Czech Translation Team - Svatopluk Vit
-Danish (da-DK) - Danish Translation Team - Ronny Buelund, Mikael Winther, Ole Bang Ottosen
-Dutch (nl-NL) - Dutch Translation Team - Vancanneyt Sander, Marijke Stuivenberg
-English (en-US) - Joomla! Project - Jennifer Marriot
-Esperanto (eo-XX) - Esperanto Translation Team - Cindy McKee, Fabien Tschudy
-Estonian (et-EE) - Estonian Translation Team - Rivo Zängov
-Finnish (fi-FI) - Finnish Translation Team - Markku Suominen
-French (fr-FR) - French Translation Team - Nicolas Ogier
-German (de-DE)/(de-CH)/(de-AT) - J!German - Jan Erik Zassenhaus, Karin Nikolaj, David Jakob, Antonio Cambule\
-Greek (el-GR) - Greek Joomla Community - Aris Ntatsis
-Gujarati (gu-IN) - Gujarati Translation Team
-Hebrew (he-IL) - Joomla!Hebrew - Mati (MtK) Kochen
-Hindi-Devanagari (hi-IN) - IndicJoomla! Team - Vishal Pahuja
-Hungarian (hu-HU) - Magyar Joomla! Felhasznalok Nemzetkozi Egyesulete - Jozsef Tamas Herczeg, Annamaria Ban
-Icelandic (is-IS) - Joomlis! Icelandic Joomla Community [joomlis.net] - Magnús Guðlaugsson
-Italian (it-IT) - Italian Translation Team - Stefania Gaianigo, Alessandro Rossi
-Japanese (ja-JP) - Japanese Translation Team - Noriaki Koide
-Laotian (lo-LA) - Joomla LaiLao Team (LaoOpenSource) - Akarawuth Tamrareang , Viengsakhone phanthanousy , Outhai Saioudom
-Latvian (lv-LV) - Joomla Latvian Team - Edgars PiruÅ¡ka, Iveta RÄ«tiņa-NamiÄ·e, Ingars StepkÄns
-Lithuanian (lt-LT) - Lithuanian Translation Team - Stasys Svabas
-Mongolian (mn-MN) - Mongolian Translation Team, Altansukh T.
-Montenegrin (sr-ME) - Montenegrin Translation Team (joomlamontenegro.com) - Miljan Vujosevic, Dragan Djordjevic
-Norwegian bokmål (nb-NO) - Joomla! i Norge - Jens-Christian Skibakk, Rune Rasmussen
-Persian/Farsi (fa-IR) - Joomfa Team(Joomla Farsi) - M.Alavi nik, Hamid abolhasani,Amin bagheri,Sayyed Saeed farzad,Sayyed ahmad sayyedi,Vahid Hosein Khani,Omid pileh var
-Polish - Poland (pl-PL) - Polskie Centrum Joomla! - Michał Sobkowiak, Stefan Wajda
-Portuguese Brazilian (pt-BR) - Joomla! Brasil - Fabricio Elias Costa (FaBMak)
-Portuguese (pt-PT) - Joomla! Portugal - Paulo Izidoro
-Romanian (ro-RO) - Romanian Joomla! Community - Cosmin Lebu
-Russian (ru-RU) - Russian Translation Team - Serge Litvinov
-Serbian (sr-RS) - Joomla! Serbia team - Marko Milenovic
-Sindhi (sd-PK) - Raheel H. Kaghzi, Shafiq-ur-rehman Khatri
-Sinhala (si-LK) - Rashan Anushka
-Slovak (sk-SK) - Slovak Translation Team - Karol Cejka, Viliam Kmec, Alexander Horvath, Marek Sabo
-Spanish (es-ES) - Joomla!'s Spanish Community Translation Team - Javier Galasse
-Swedish (sv-SE) - Swedish Translation Team (SvenskJoomla!) - Sune Hultman, Christer Gerhardsson
-Syriac (sy-IQ) - Pauls! Dinka
-Tamil (ta-LK) - Sri Lanka -UoM, LK, sarves
-Thai (th-TH) - Joomla LaiThai Team (JoomlaCorner) - Akarawuth Tamrareang , Supachai Teasakul, Pisan Chueachatchai
-Turkish (tr-TR) - Joomla! Turkiye - Ümit Kenan Gönüllü, Uğur Uygur
-Ukrainian (uk-UA) - Ukrainian Translation Team - Denys Nosov
-Urdu Pakistan (ur-PK) - Basim
-Vietnamese (vi-VN) - Việt Nam Translation Team - Viet Hoang Vu
-
-Pizza Bug and fun Event
------------------------
-Chris Davenport
-Kevin Devine
-Anthony Ferrara
-Jerry Hilburn
-Louis Landry
-Wilco Jansen
-Jennifer Marriott
-Rob Schley
-Amy Stephen
-Nereyda Valentin-Macias
-Elin Waring
-Michael Casha
-Marcelo Eden
-Matt Thomas
-Ross Crawford
-Mickael Maison
-Ian MacLennan
-Jaap Woltjes
-Alan Langford
-Michael Hamanaka
-Joe LeBlanc
-Shannon Quinn
-Michelle Bisson
-Airton Torres
-Toni Marie Swats
-Jon Giles
-Matheus Mendes
-
-Joomla! 1.5 includes or is derivative of works distributed under the licenses listed below.
-The full text for most of the licenses listed below can be found in the LICENSES.php file.
-The original copyright notices have been preserved within the respective files and or
-packages. Please refer to the specific files and/or packages for more detailed information
-about the authors, copyright notices, and licenses.
----------------------------------------------------------------------------------------------
-
-Archive
--------
-Author: Vincent Blavet
-Copyright: Copyright (C) 1997-2003 The PHP Group
-License: BSD License
-
-Domit
------
-Author: John Heinstein
-Copyright: Copyright (C) 2004 John Heinstein. All rights reserved
-License: GNU Lesser General Public License (LGPL) 2.1 or later
-
-Feedcreator
------------
-Author: Kai Blankenhorn
-Copyright: Copyright (C) Kai Blankenhorn
-License: GNU Lesser General Public License (LGPL) 2.1 or later
-
-js-calendar
------------
-Author: Mihai Bazon
-Copyright: Copyright (C) Mihai Bazon, 2002
-License: GNU Lesser General Public License (LGPL) 2.1 or later
-
-js-dtree
---------
-Author: Geir Landrö
-Copyright: Copyright (c) 2002-2003 Geir Landrö
-License: Freeware license
-
-js-jscook-menu
---------------
-Author: Heng Yuan
-Copyright: Copyright (C) 2002-2005 by Heng Yuan
-License: MIT License
-
-js-overlib
-----------
-Author: Erik Bosrup
-Copyright: Copyright (C) Erik Bosrup 1998-2004. All rights reserved.
-License: Artistic (see http://www.bosrup.com/web/overlib/?License)
-
-js-squeezebox, js-swiff, js-fancyupload
----------------------------------------
-Author: Harald Kirschner
-Copyright: Copyright (C) Harald Kirschner
-License: MIT-style license
-
-js-tab-pane
------------
-Author: Erik Arvidsson
-Copyright: Copyright (C) 1998 - 2003 Erik Arvidsson
-License: GNU General Public License (GPL)
-
-js-wz-tooltip
--------------
-Author: Walter Zorn
-Copyright: Copyright (c) 2002-2004 Walter Zorn. All rights reserved.
-License: GNU Lesser General Public License (LGPL) 2.1 or later
-
-Mootools
---------
-Author: Valerio Proietti
-Copyright: Copyright (C) 2007 Valerio Proietti
-License: MIT license
-
-patError
-------
-Author: gERD Schaufelberger, Sebastian Mordziol, Stephan Schmidt
-Copyright: Copyright (C) gERD Schaufelberger, Sebastian Mordziol, Stephan Schmidt
-License: GNU Lesser General Public License (LGPL)
-
-patTemplate
------------
-Author: Stephan Schmidt
-Copyright: Copyright (C) Stephan Schmidt
-License: GNU Lesser General Public License (LGPL)
-
-Pear
-----
-Author: Sterling Hughes, Stig Bakken, Tomas V.V.Cox, Greg Beaver
-Copyright: Copyright (C) 1997-2006 The PHP Group
-License: PHP License 3.0
-
-PHPGACL
--------
-Author: Mike Benoit
-Copyright: Copyright (C) 2002, 2003 Mike Benoit
-License: GNU Lesser General Public License (LGPL) 2.1 or later
-
-PHPInputfilter
---------------
-Author: Daniel Morris
-Copyright: Copyright (C) Daniel Morris
-License: GNU General Public License (GPL)
-
-PHPMailer
---------
-Author: Brent R. Matzelle
-Copyright: Copyright (C) 2001 - 2003 Brent R. Matzelle
-License: GNU Lesser General Public License (LGPL) 2.1
-
-phpUTF8
--------
-Author: Harry Fuecks
-Copyright: Copyright (C) Harry Fuecks
-License: GNU Lesser General Public License (LGPL) 2.1
-
-PHPXMLRPC
----------
-Author: Edd Dumbill
-Copyright: Copyright (C) 1999,2000,2002 Edd Dumbill
-License: BSD License
-
-SimplePie
----------
-Author: Ryan Parman and Geoffrey Sneddon
-Copyright: Copyright (C) 2004-2007, Ryan Parman and Geoffrey Sneddon
-License: BSD License
-
-TCPDF
------
-Author: Nicola Asuni
-Copyright: Copyright (C) Nicola Asuni
-License: GNU Lesser General Public License (LGPL) 2.1
-
-TinyMCE
--------
-Author: Moxiecode Systems
-Copyright: Copyright (C) 2005-2006, Moxiecode Systems AB, All rights reserved.
-License: GNU Lesser General Public License (LGPL) 2.1
-
-VCard
------
-Author: Kai Blankenhorn
-Copyright: Copyright (C) Kai Blankenhorn
-License: GNU General Public License (GPL) 2 or later
-
-XStandard Lite
---------------
-Author: Belus Technology Inc.
-Copyright: Copyright (c) 2006 Belus Technology Inc.
-License: Freeware license
-
-FOOOD Icons
------------
-Copyright: 2004 iCandy Junior Icons
-License: http://www.iconaholic.com/help/joomla.html
-Notes: Please note these icons are NOT OPEN SOURCE but used with permission
-
-Print & Email Front End Icons
------------------------------
-Copyright: Copyright (C) 2005 Plone Foundation
-License: GNU Lesser General Public License (LGPL)
-
-
-
--------------------- Joomla! 1.0 Credits ---------------------
-
-Code contributers:
-------------------
-Nick Anies
-Brad Baker
-Ron Bakker
-Shayne Bartlett
-Tim Broeker
-Levis Bisson
-Michelle Bisson
-Robert Castley
-Andrew Eddie
-Rey Gigataras
-Johan Janssens
-Alex Kempkens
-Peter Koch
-Louis Landry
-James Logan
-Andy Miller
-Mitch Pirtle
-Steen Rabol
-Peter Russel
-Phil Taylor
-Brian Teeman
-Emir Sakic
-Rob Schley
-Jean-Marie Simonet
-Andy Stewart
-Trijnie Wanders
-Arno Zijlstra
-
-Joomla! 1.0 includes or is derivative of works distributed under the licenses listed below.
-The full text for most of the licenses listed below can be found in the LICENSES.php file.
-Some of the licenses could not be copied without permission. In those cases, URLs are
-provided to the full text of the license. The original copyright notices have been preserved
-within the respective files and or packages. Please refer to the specific files and/or
-packages for more detailed information about the authors, copyrights, and licenses.
----------------------------------------------------------------------------------------------
-
-Archive
--------
-Author: Vincent Blavet
-Copyright: Copyright (C) 1997-2003 The PHP Group
-License: PHP License 3.0
-
-Cache
------
-Author: Fabien Marty
-Copyright: Copyright (C) Fabien Marty
-License: GNU Lesser General Public License (LGPL)
-
-Domit
------
-Author: John Heinstein
-Copyright: Copyright (C) 2004 John Heinstein. All rights reserved
-License: GNU Lesser General Public License (LGPL)
-
-ezpdf
------
-Author: Wayne Munro, R&OS Ltd.
-License: Public Domain
-
-Feedcreator
------------
-Author: Kai Blankenhorn
-Copyright: Copyright (C) Kai Blankenhorn
-License: GNU Lesser General Public License (LGPL)
-
-js-calendar
------------
-Author: Mihai Bazon
-Copyright: Copyright (C) Mihai Bazon, 2002
-License: GNU Lesser General Public License (LGPL)
-
-js-jscook-menu
---------------
-Author: Heng Yuan
-Copyright: Copyright (C) 2002-2005 by Heng Yuan
-License: MIT License
-
-js-overlib
-----------
-Author: Erik Bosrup
-Copyright: Copyright (C) Erik Bosrup 1998-2004. All rights reserved.
-License: Artistic (see http://www.bosrup.com/web/overlib/?License)
-
-js-tabs
--------
-Author: Erik Arvidsson
-Copyright: Copyright (C) 1998 - 2003 Erik Arvidsson
-License: GNU General Public License (GPL)
-
-Mambo
------
-Copyright: Copyright (C) 2000 - 2004 Mambo Foundation, Inc.
-Copyright: Copyright (C) 2000 - 2004 Miro International Pty Ltd.
-License: GNU General Public License (GPL)
-
-patError
---------
-Author: gERD Schaufelberger, Sebastian Mordziol, Stephan Schmidt
-Copyright: Copyright (C) gERD Schaufelberger, Sebastian Mordziol, Stephan Schmidt
-License: GNU Lesser General Public License (LGPL)
-
-patTemplate
------------
-Author: Stephan Schmidt
-Copyright: Copyright (C) Stephan Schmidt
-License: GNU Lesser General Public License (LGPL)
-
-Pear
-----
-Author: Sterling Hughes, Stig Bakken, Tomas V.V.Cox, Greg Beaver
-Copyright: Copyright (C) 1997-2006 The PHP Group
-License: PHP License 3.0
-
-PHPGACL
--------
-Author: Mike Benoit
-Copyright: Copyright (C) 2002, 2003 Mike Benoit
-License: GNU Lesser General Public License (LGPL)
-
-PHPInputfilter
---------------
-Author: Daniel Morris
-Copyright: Copyright (C) Daniel Morris
-License: GNU General Public License (GPL)
-
-PHPMailer
----------
-Author: Brent R. Matzelle
-Copyright: Copyright (C) 2001 - 2003 Brent R. Matzelle
-License: GNU General Public License (GPL)
-
-TinyMCE
--------
-Author: Moxiecode Systems
-Copyright: Copyright (C) 2005-2006, Moxiecode Systems AB, All rights reserved.
-License: GNU Lesser General Public License (LGPL)
-
-VCard
------
-Author: Kai Blankenhorn
-Copyright: Copyright (C) Kai Blankenhorn
-License: GNU General Public License (GPL)
-
-wz-tooltip
-----------
-Author: Walter Zorn
-Copyright: Copyright (c) 2002-2004 Walter Zorn. All rights reserved.
-License: GNU Lesser General Public License (LGPL)
-
-FOOOD Icons (Administrator Toolbar)
------------------------------------
-Copyright: 2004 iCandy Junior Icons
-License: http://www.iconaholic.com/help/joomla.html
-Notes: Please note these icons are NOT OPEN SOURCE but used with permission
+The list of contributors before migrating to GitHub is available at:
+https://docs.joomla.org/Joomla:Joomla_Version_Credits
diff --git a/installation/application/web.php b/installation/application/web.php
index c5bd401cfb776..8420f32908cff 100644
--- a/installation/application/web.php
+++ b/installation/application/web.php
@@ -534,7 +534,7 @@ public function loadSession(JSession $session = null)
if (!$session->get('registry') instanceof Registry)
{
// Registry has been corrupted somehow.
- $session->set('registry', new Registry('session'));
+ $session->set('registry', new Registry);
}
// Set the session object.
diff --git a/installation/language/bs-BA/bs-BA.ini b/installation/language/bs-BA/bs-BA.ini
index 5a6b3ec79519a..2293429bcc415 100644
--- a/installation/language/bs-BA/bs-BA.ini
+++ b/installation/language/bs-BA/bs-BA.ini
@@ -28,7 +28,8 @@ INSTL_PRECHECK_ACTUAL="Trenutno"
; Database view
INSTL_DATABASE="Konfiguracija baze podataka"
-INSTL_DATABASE_HOST_DESC="UobiÄajeno je ovdje "localhost""
+INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL upit na bazu nije uspio."
+INSTL_DATABASE_HOST_DESC="UobiÄajeno je ovdje "localhost" ili ime koje ste dobili od hostera."
INSTL_DATABASE_HOST_LABEL="Ime servera"
INSTL_DATABASE_NAME_DESC="Neki hostinzi dozvoljavaju samo odreÄ‘ena imena baze podataka za svaki portal. Koristite drugaÄiji prefiks tablice za razliÄite Joomla! portale."
INSTL_DATABASE_NAME_LABEL="Ime baze podataka"
@@ -42,9 +43,10 @@ INSTL_DATABASE_PREFIX_LABEL="Prefiks tablice"
INSTL_DATABASE_PREFIX_MSG="Prefiks baze podataka mora poÄeti slovom, za kojim slijede proizvoljni alfanumeriÄki znakovi, a zavrÅ¡iti donjom crtom"
INSTL_DATABASE_TYPE_DESC="Ovo je vjerovatno "MySQLi""
INSTL_DATABASE_TYPE_LABEL="Tip baze podataka"
-INSTL_DATABASE_USER_DESC="NeÅ¡to kao "_QQ_"root"_QQ_" ili korisniÄko ime dobiveno od hostinga"
+INSTL_DATABASE_USER_DESC="KorisniÄko ime koje ste kreirali ili korisniÄko ime dobiveno od hostera."
INSTL_DATABASE_USER_LABEL="KorisniÄko ime"
+
;FTP view
INSTL_AUTOFIND_FTP_PATH="Automatsko traženje FTP putanje"
INSTL_FTP="FTP Konfiguracija"
@@ -142,7 +144,7 @@ INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Verzija"
INSTL_LANGUAGES_DESC="Joomla interfejs je dostupan na nekoliko jezika. Izaberite jezik i instalirajte ga klikom na 'Dalje'.
Napomena: ova operacija traje oko 10 sekundi za preuzimanje i instaliranje svakog jezika. Nemojte izabrati više od 3 jezika za istovremenu instalaciju, da zbog previše duge instalacije ne bi došlo do prekida programa." INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Ova operacija traje oko 10 sekundi po jeziku
Molim saÄekajte da Joomla preuzme i instalira jezik..." INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nijedan jezik nije odabran za instaliranje. Ako želite da instalirate viÅ¡e jezika kliknite na dugme 'Prethodno' i odaberite željeni jezik iz liste" -INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ne može da se prijavi na server sa jezicima. ZavrÅ¡ite instalacioni proces." +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla ne može da se prijavi na server sa jezicima. ZavrÅ¡ite instalacioni proces." INSTL_LANGUAGES_WARNING_NO_INTERNET2="Napomena: Jezik možete instalirati iz Joomla! administracije" INSTL_LANGUAGES_WARNING_BACK_BUTTON="Povratak na zadnji instalacioni korak" @@ -158,6 +160,7 @@ INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Odaberi" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Jezik" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Oznaka" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla nije u mogućnosti da automatski kreira sadržaj za jezik %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ADD_ASSOCIATIONS="Joomla ne može automatski da kreira jeziÄku asocijaciju." INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla ne može automatski da kreira izbornik %s" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla ne može automatski da kreira poÄetnu stavku izbornika %s" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla ne može automatski da kreira izbornik modul %s" @@ -274,7 +277,7 @@ JCHECK_AGAIN="Provjeri ponovo" JERROR="GreÅ¡ka" JEMAIL="E-poÅ¡ta" JGLOBAL_ISFREESOFTWARE="%s je slobodan softver pod %s." -JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="JeziÄki paket ne odgovara ovoj Joomla! verziji. Nedostaju neki izrazi." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="JeziÄni paket ne odgovara ovoj verziji Joomle. Neki prijevodi bi mogli nedostajati i biti će prikazani na engleskom." JGLOBAL_SELECT_AN_OPTION="Odaberite opciju" JGLOBAL_SELECT_NO_RESULTS_MATCH="Nema odgovarajućih rezultata" JGLOBAL_SELECT_SOME_OPTIONS="Odaberite neku opciju" @@ -323,3 +326,16 @@ POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" + +; Javascript message titles +ERROR="GreÅ¡ka" +MESSAGE="Poruka" +NOTICE="Napomena" +WARNING="Upozorenje" + +; Javascript ajax error messages +JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="DoÅ¡lo je do prekida veze prilikom dohvaćanja JSON podataka." +JLIB_JS_AJAX_ERROR_NO_CONTENT="Nema vraćenog sadržaja." +JLIB_JS_AJAX_ERROR_OTHER="GreÅ¡ka kod dohvaćanja JSON podataka: HTTP %s status kôd." +JLIB_JS_AJAX_ERROR_PARSE="GreÅ¡ka prilikom procesiranja JSON podataka:
Bosanski (BA)
- 3.6.0
- May 2016
+ 3.6.3
+ October 2016
Bosnian Translation Team
Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/dz-BT/dz-BT.ini b/installation/language/dz-BT/dz-BT.ini
index 7b1fa45c8eaa2..3cfa77931d219 100644
--- a/installation/language/dz-BT/dz-BT.ini
+++ b/installation/language/dz-BT/dz-BT.ini
@@ -28,6 +28,7 @@ INSTL_PRECHECK_ACTUAL="ངོ་མà¼"
; Database view
INSTL_DATABASE="གནས་སྡུད་གཞི་མཛོད་ཀྱི་རིམ་སྒྲིག"
+INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="གནས་སྡུད་གཞི་མཛོད་ PostgreSQL གི་ དོགས་གཅོད་འབད་ནི་འདི་ མà½à½¢à¼‹à½˜à¼‹à½ à½à¾±à½¼à½£à¼"
INSTL_DATABASE_HOST_DESC="འདི་ ཨ་རྟག་བཟུམ་སྦེ་ "localhost" ཨིནà¼"
INSTL_DATABASE_HOST_LABEL="འགོ་འདྲེན་པའི་མིང་à¼"
INSTL_DATABASE_NAME_DESC="ལ་ལུ་འགོ་འདྲེན་པ་གི་ ས་à½à½¼à½„ས་རེ་རེ་ལུ་ གནས་སྡུད་གཞི་མཛོད་ཀྱི་མིང་ འཚམས་ཅིག་རà¾à¾±à½„མ་ཅིག་བཞག་བཅུག་འོང་༠འ་ནི་ ཇུམ་ལ་(Joomla) ས་à½à½¼à½„ས་སོ་སོའི་གནས་སྟངས་ཀྱི་དོན་ལུ་ རྫས་à½à½¼à½ ི་སྔོན་ཚིག་ལག་ལེན་འà½à½–à¼"
@@ -136,6 +137,7 @@ INSTL_COMPLETE_INSTALL_LANGUAGES="གོ་རིམ་ལྷན་à½à½–སà¼
;Languages view
INSTL_LANGUAGES="སà¾à½‘་ཡིག་ཆ་ཚང་བཙུགསà¼"
INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="སà¾à½‘་ཡིག"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="སà¾à½‘་ཡིག་གི་མིང་རྟགསà¼"
INSTL_LANGUAGES_COLUMN_HEADER_VERSION="à½à½¼à½“་རིམà¼"
INSTL_LANGUAGES_DESC="ཇུམ་ལ་(Joomla)ངོ་བྱང་འདི་ སà¾à½‘་ཡིག་ལེ་ཤ་ཅིག་ནང་ལུ་à½à½¼à½–་ཚུགས༠à½à¾±à½¼à½‘་ར་ གདམ་à½à¼‹à½…ན་གྱི་སà¾à½‘་ཡིག་འདི་ གདམ་འཛིན་ནང་ལས་གདམ་à½à¼‹à½¢à¾à¾±à½–་བཞིནམ་ལས་ ཤུལ་མམ་གྱི་འཕྲུལ་རྟ་འདི་ གདམ་à½à¼‹à½¢à¾à¾±à½–་à½à½ºà¼‹à½–ཙུགས་བཞག་འབདà¼
བརྗེད་à½à½¼à¼: འ་ནི་གློག་རིག་ལས་སྤྱོད་ཀྱི་ སà¾à½‘་ཡིག་གནས་སྡུད་སྤོ་ནི་དང་བཙུགས་ནི་དོན་ལུ་ སà¾à½¢à¼‹à½†à¼‹ ༡༠དེ་ཅིག་འགོར་འོང་༠འདི་ དུས་ཚད་མ་ལང་པའི་དཀའ་ངལ་ལས་འཛེམ་ནི་དོན་ལུ་ སà¾à½‘་ཡིག་བཙུགས་ནི་ ༣ ལས་མངམ་ གདམ་à½à¼‹à½˜à¼‹à½¢à¾à¾±à½–༠" INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="འ་ནི་གློག་རིག་ལས་སྤྱོད་ཀྱི་ སà¾à½‘་ཡིག་ཅིག་བཟོ་ནིའི་དོན་ལུ་ སà¾à½¢à¼‹à½†à¼‹ ༡༠ཚུན་ཚད་འགོར་འོང་à¼
སà¾à½‘་ཡིག་ཚུ་ གནས་སྡུད་སྤོ་བའི་སà¾à½–ས་དང་ བཙུགས་བཞག་འབད་བའི་སà¾à½–ས་ལུ་ སྒུག་གནངà¼" @@ -180,7 +182,7 @@ INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="འ་ནི་ཚ་ཚན་འད INSTL_DEFAULTLANGUAGE_TRY_LATER="ཤུལ་ལས་ à½à¾±à½¼à½‘་ར་ཇུམ་ལ་(Joomla)གི་བདག་སà¾à¾±à½¼à½„་པ་ལག་ལེན་འà½à½–་à½à½ºà¼‹ བཙུགས་བཞག་འབད་ཚུགསà¼" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español -INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="རྫོང་à½à¼‹ (BT)" +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="དབྱིན་སà¾à½‘à¼(BT)" ;Database Model INSTL_DATABASE_COULD_NOT_CONNECT="གནས་སྡུད་གཞི་མཛོད་ལུ་ མà½à½´à½‘་མ་ཚུགས༠འབྲེལ་མà½à½´à½‘་ལོག་མི་གྱངས་à½à¼‹ : %s" @@ -192,6 +194,7 @@ INSTL_DATABASE_ERROR_CREATE="གནས་སྡུད་གཞི་མཛོད INSTL_DATABASE_ERROR_DELETE="འཛོལ་བ་ལ་ལུ་ གནས་སྡུད་གཞི་མཛོད་བà½à½¼à½“་གà½à½„་བའི་སà¾à½–ས་འབྱུང་ནུག" INSTL_DATABASE_FIELD_VALUE_REMOVE="བà½à½¼à½“་གà½à½„à¼" INSTL_DATABASE_FIELD_VALUE_BACKUP="རྒྱབ་སྣོནà¼" +INSTL_DATABASE_FIX_LOWERCASE="གནས་སྡུད་གཞི་མཛོད་ PostgreSQL གི་དོན་ལུ་ à½à½¼à½ ི་སྔོན་ཚིག་འདི་ ཡིག་ཆུང་འོང་དགོà¼" INSTL_DATABASE_FIX_TOO_LONG="མའི་ཨེས་ཀིà½à¼‹à½¨à½ºà½£à¼‹(MySQL) རྫས་à½à½¼à½ ི་སྔོན་ཚིག་འདི་ à½à¾±à½‘་ཆོས་མà½à½¼à¼‹à½¤à½¼à½¦à¼‹ ༡༥ དགོà¼" INSTL_DATABASE_INVALID_DB_DETAILS="གནས་སྡུད་གཞི་མཛོད་ཀྱི་à½à¼‹à½‚སལ་བཀལ་ཡོད་མི་འདི་ འཛོལ་བ་ ཡང་ན་ སྟོངམ་འདུག" INSTL_DATABASE_INVALID_MYSQL_VERSION="à½à¾±à½¼à½‘་ར་ བཙུགས་བཞག་འཕྲོ་མà½à½´à½‘་འབད་ནིའི་དོན་ལུ་ མའི་ཨེས་ཀིà½à¼‹à½¨à½ºà½£à¼‹(MySQL) ༥.༠.༤ ཡང་ན་ འདི་ལས་མà½à½¼à¼‹à½¤à½¼à½¦à¼‹à½‘གོ༠à½à¾±à½¼à½‘་ཀྱི་ à½à½¼à½“་རིམ་འདི་ %s" @@ -248,8 +251,10 @@ INSTL_MAGIC_QUOTES_GPC="སྒྱུ་མའི་དཔེ་བཀོད་ G INSTL_MAGIC_QUOTES_RUNTIME="སྒྱུ་མའི་དཔེ་བཀོད་རྒྱུ་ལམ་གྱི་དུསà¼" INSTL_MB_LANGUAGE_IS_DEFAULT="སà¾à½‘་ཡིག་ MB འདི་སྔོན་སྒྲིག་ཨིནà¼" INSTL_MB_STRING_OVERLOAD_OFF="རྗོད་ཚིག་ MB གི་མང་དྲགས་འདི་ ངོས་ལེན་མེདཔà¼" +INSTL_MCRYPT_SUPPORT_AVAILABLE="Mcrypt གི་རྒྱབ་རྟེནà¼" INSTL_NOTICEMBLANGNOTDEFAULT="སà¾à½‘་ཡིག་ PHP mbstring འདི་བར་གནས་ལུ་མ་བཟོ་ནུག༠འ་ནི་འདི་
རིམ་སྒྲིག་བཟོ་བཀོད་འདི་མཇུག་ལུ་གསལ་སྟོན་འབད་ནི་ཨིནམ་ལས་ à½à¾±à½¼à½‘་ར་ བཙུགས་བཞག་འདི་ད་ལྟོ་ཡང༌འཕྲོ་མà½à½´à½‘་འབད་ཚུགས༠à½à¾±à½¼à½‘་ར་ གསང་ཚིག་འདི་ལགཔ་གི་འབད་ བཙུགས་དགོ༠ཚིག་ཡིག་ས་à½à½¼à½„ས་ནང་ལས་ གསང་ཡིག་འདི་གདམ་à½à¼‹à½¢à¾à¾±à½–་à½à½ºà¼‹ གཙོ་རྟགས་བཀལ་ དེ་ལས་ ཡིག་སྣོད་གསརཔ་ནང་ལུ་བཙུགས༠ཡིག་སྣོད་ཀྱི་མིང་ 'configuration.php' བཟོ་སྟེ་ ས་à½à½¼à½„ས་རྩ་ལག་གི་ཡིག་སྣོད་ནང་ལུ་བཙུགསà¼" INSTL_OUTPUT_BUFFERING="གྲུབ་འབྲསའི་བར་ཤུགས་བཟེད་མིà¼" INSTL_PARSE_INI_FILE_AVAILABLE="INI པར་སར་(Parser) རྒྱབ་རྟེནà¼" diff --git a/installation/language/dz-BT/dz-BT.xml b/installation/language/dz-BT/dz-BT.xml index 6893659557143..694e13cdfc959 100644 --- a/installation/language/dz-BT/dz-BT.xml +++ b/installation/language/dz-BT/dz-BT.xml @@ -3,8 +3,8 @@ version="3.6" client="installation">Dzongkha (Bhutan)
- 3.5.0
- November 2015
+ 3.6.2
+ August 2016
Dzongkha Translation Team
Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/el-GR/el-GR.ini b/installation/language/el-GR/el-GR.ini
index f5b494fc2b600..57635ae19a0b1 100644
--- a/installation/language/el-GR/el-GR.ini
+++ b/installation/language/el-GR/el-GR.ini
@@ -28,6 +28,7 @@ INSTL_PRECHECK_ACTUAL="Î Ïαγματικό"
; Database view
INSTL_DATABASE="Ρυθμίσεις Βάσης ΔεδομÎνων"
+INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Αποτυχία επεÏωτήματος βάσης δεδομÎνων PostgreSQL."
INSTL_DATABASE_HOST_DESC="Συνήθως είναι "_QQ_"localhost"_QQ_""
INSTL_DATABASE_HOST_LABEL="Όνομα διακομιστή"
INSTL_DATABASE_NAME_DESC="ΟÏισμÎνοι διακομιστÎÏ‚ επιτÏÎπουν μόνο συγκεκÏιμÎνα ονόματα βάσεων δεδομÎνων για κάθε ιστοσελίδα. ΧÏησιμοποιήστε σε αυτή την πεÏίπτωση Ï€ÏοθÎματα πινάκων για ξεχωÏιστÎÏ‚ ιστοσελίδες Joomla!."
@@ -45,6 +46,7 @@ INSTL_DATABASE_TYPE_LABEL="Είδος βάσης δεδομÎνων"
INSTL_DATABASE_USER_DESC="Συνήθως Îιναι "_QQ_"root"_QQ_" ή το όνομα χÏήστη από τον κεντÏικό υπολογιστή."
INSTL_DATABASE_USER_LABEL="Όνομα χÏήστη"
+
;FTP view
INSTL_AUTOFIND_FTP_PATH="Αυτόματη ΕÏÏεση διαδÏομής FTP"
INSTL_FTP="ΡÏθμιση FTP"
@@ -116,13 +118,19 @@ INSTL_EMAIL_NOT_SENT="Το μήνυμα δεν στάλθηκε."
;Complete view
INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="ΛεπτομÎÏειες σÏνδεσης διαχειÏιστή"
+; The word 'installation' should not be translated as it is a physical folder.
INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Ο φάκελος installation Îχει ήδη διαγÏαφεί."
+; The word 'installation' should not be translated as it is a physical folder.
INSTL_COMPLETE_ERROR_FOLDER_DELETE="Ο φάκελος installation δεν διαγÏάφηκε. ΠαÏακαλώ διαγÏάψτε τον με το χÎÏι."
+; The word 'installation' should not be translated as it is a physical folder.
INSTL_COMPLETE_FOLDER_REMOVED="Ο φάκελος installation Îχει αφαιÏεθεί επιτυχώς"
INSTL_COMPLETE_LANGUAGE_1="ΘÎλετε το Joomla! στη γλώσσα σας;"
+; The word 'installation' should not be translated as it is a physical folder.
INSTL_COMPLETE_LANGUAGE_DESC="Î Ïιν απομακÏÏνεται το φάκελο installation μποÏείτε να εγκαταστήσετε επιπλÎον γλώσσες. Αν επιθυμείτε να Ï€ÏοσθÎσετε επιπλÎον γλώσσες στην Joomla! εφαÏμογή σας κάντε κλικ στο κουμπί που ακολουθεί."
INSTL_COMPLETE_LANGUAGE_DESC2="Σημείωση: Î ÏÎπει να Îχετε Ï€Ïόσβαση στο ΙντεÏνετ για να επιτÏαπεί στο Joomla! να κάνει λήψη και εγκατάσταση νÎων γλωσσών.
" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="ΑφαίÏεση φακÎλου installation" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_INSTALLATION="ΠΑΡΑΚΑΛΩ ΘΥΜΗΘΕΙΤΕ ÎΑ ΔΙΑΓΡΑΨΕΤΕ ΤΟΠΦΑΚΕΛΟ INSTALLATION.
Δε θα μποÏÎσετε να Ï€ÏοχωÏήσετε Ï€ÎÏα απο αυτό το σημείο της εγκατάστασης μÎχÏι να απομακÏÏνετε εντελώς το φάκελο installation. Î Ïόκειται για μια δικλείδα σσφαλείας του Joomla!." INSTL_COMPLETE_TITLE="ΣυγχαÏητήÏια! Εγκαταστήσατε το Joomla!." INSTL_COMPLETE_INSTALL_LANGUAGES="ΕπιπλÎον βήματα: Εγκατάσταση γλωσσών" @@ -130,6 +138,7 @@ INSTL_COMPLETE_INSTALL_LANGUAGES="ΕπιπλÎον βήματα: Εγκατάσ ;Languages view INSTL_LANGUAGES="Εγκατάσταση πακÎτων γλωσσών" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Γλώσσα" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="ΕτικÎτα Γλώσσας" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Έκδοση" INSTL_LANGUAGES_DESC="Αυτή η διεπαφή του Joomla Îιναι διαθÎσιμη σε πολλÎÏ‚ γλώσσες. ΔιαλÎξτε τις γλώσσες που Ï€Ïοτιμάτε κάνοντας κλίκ στα αντίστοιχα κουτάκια και εγκαταστήστε τις πατώντας το κουμπί Επόμενο.
ΣημÎιωση: Αυτή η διεÏγασία διαÏκεί πεÏίπου 5 δευτεÏόλεπτα για λήψη και εγκατάσταση κάθε γλώσσας. ΠαÏακαλώ μην επιλεξετε πεÏισσότεÏες απο 3 γλώσσες για εγκατάσταση για να αποφÏγετε timeouts." INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Αυτή η διεÏγασία θα διαÏκÎσει πεÏίπου 10 δευτεÏόλεπτα για κάθε γλώσσα για να ολοκληÏωθεί.
ΠαÏακαλώ πεÏιμÎνετε ενώ γίνεται λήψη και εγκατάσταση των γλωσσών..." @@ -150,6 +159,7 @@ INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Το Joomla ÏŒÏισε τα %s σαν INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Επιλογή" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Γλώσσα" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="ΕτικÎτα" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ADD_ASSOCIATIONS="Το Joomla δεν μπόÏεσε να δημιουÏγήσει αυτόματα τις συσχÎτισεις γλωσσών." INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Το Joomla δεν μπόÏεσε να δημιουÏγήσει αυτόματα την γλώσσα πεÏιεχομÎνου %s" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Το Joomla δεν μπόÏεσε να δημιουÏγήσει αυτόματα το Î¼ÎµÎ½Î¿Ï %s" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Το Joomla δεν μπόÏεσε να δημιουÏγήσει αυτόματα το αντικείμενο αÏχικής σελίδας %s" @@ -186,6 +196,7 @@ INSTL_DATABASE_ERROR_CREATE="Î ÏοÎκυψε Îνα σφάλμα κατά τη INSTL_DATABASE_ERROR_DELETE="Î ÏοÎκυψαν σφάλματα κατα την διαγÏαφή της βάσης δεδομÎνων." INSTL_DATABASE_FIELD_VALUE_REMOVE="ΑφαίÏεση" INSTL_DATABASE_FIELD_VALUE_BACKUP="ΑντίγÏαφο ασφαλείας" +INSTL_DATABASE_FIX_LOWERCASE="Το Ï€Ïόθεμα πινάκων βάσης δεδομÎνων Ï€ÏÎπει να είναι με πεχά για την PostgreSQL." INSTL_DATABASE_FIX_TOO_LONG="Το Ï€Ïοθεμα του πίνακα MySQL Ï€ÏÎπει να είναι εως 15 χαÏακτήÏες." INSTL_DATABASE_INVALID_DB_DETAILS="Οι πληÏοφοÏίες σχετικά με την βάση δεδομÎνων είναι λανθασμενες και/ή κενÎÏ‚." INSTL_DATABASE_INVALID_MYSQL_VERSION="Απαιτείται Îκδοση MySQL 5.0.4 ή μεγαλÏτεÏη για να συνεχίσετε την εγκατάσταση. Η Îκδοσή σας είναι: %s" @@ -242,8 +253,10 @@ INSTL_MAGIC_QUOTES_GPC="Μαγικά Εισαγωγικά GPC απενεÏγοπ INSTL_MAGIC_QUOTES_RUNTIME="Μαγικά Εισαγωγικά ΧÏόνου ΕκτÎλεσης" INSTL_MB_LANGUAGE_IS_DEFAULT="Η γλώσσα MB είναι Ï€Ïοεπιλογή" INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload απενεÏγοποιημÎνο" +INSTL_MCRYPT_SUPPORT_AVAILABLE="ΥποστήÏιξη Mcrypt" INSTL_NOTICEMBLANGNOTDEFAULT="Η γλώσσα PHP mbstring δεν οÏίστηκε σαν ουδÎτεÏη. Αυτό μποÏεί να οÏιστεί τοπικά γÏάφοντας php_value mbstring.language neutral στο αÏχείο
ΜποÏείτε να συνεχίσετε την εγκατάσταση καθώς οι Ïυθμίσεις θα εμφανίζονται στο Ï„Îλος. Θα Ï€ÏÎπει να μεταφοÏτώσετε τον κώδικα με το χÎÏι. ΚλικάÏετε στην πεÏιοχή κειμÎνου για να επιλÎξετε όλο τον κώδικα και επικολλήστε τον σε Îνα νÎο αÏχείο κειμÎνου. Ονομάστε αυτό το αÏχείο 'configuration.php' και μεταφοÏτώστε το στον κεντÏικό φάκελο της ιστοσελίδας σας." INSTL_OUTPUT_BUFFERING="Ρυθμιστής Εξόδου" INSTL_PARSE_INI_FILE_AVAILABLE="ΥποστήÏιξη INI Parser " @@ -313,3 +326,17 @@ POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" + +; Javascript message titles +ERROR="Σφάλμα" +MESSAGE="Μήνυμα" +NOTICE="Ειδοποίηση" +WARNING="Î Ïοειδοποίηση" + +; Javascript ajax error messages +JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Η σÏνδεση ανεστάλει κατά την ανάκτηση δεδομÎνων JSON." +JLIB_JS_AJAX_ERROR_NO_CONTENT="Δεν επεστÏάφει πεÏιεχόμενο." +JLIB_JS_AJAX_ERROR_OTHER="Σφάλμα κατά την ανάκτηση δεδομÎνων JSON: Κωδικός κατάστασης HTTP %s." +JLIB_JS_AJAX_ERROR_PARSE="Σφάλμα ανάλυσης κατά την επεξεÏγασία των παÏακάτω δεδομÎνων JSON:
Greek
- 3.4.2
+ 3.6.3
2015-06-13
Greek translation team : joomla.gr
Copyright (C) 2005 - 2013 joomla.gr και Open Source Matters. All rights reserved.
- GNU General Public License Îκδοση 2 ή νεότεÏη· δες LICENSE.txt
+ GNU General Public License version 2 or later; see LICENSE.txt
el-GR.ini
diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml
index 9604a0379eb32..18e6d824c9b7f 100644
--- a/installation/language/en-GB/en-GB.xml
+++ b/installation/language/en-GB/en-GB.xml
@@ -3,7 +3,7 @@
version="3.6"
client="installation">
English (United Kingdom)
- 3.6.3
+ 3.6.4
October 2016
Joomla! Project
Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
@@ -12,7 +12,8 @@
en-GB.ini
- English (United Kingdom)
+ English (en-GB)
+ English (United Kingdom)
en-GB
0
diff --git a/installation/language/en-NZ/en-NZ.ini b/installation/language/en-NZ/en-NZ.ini
new file mode 100644
index 0000000000000..6de13cc898ebb
--- /dev/null
+++ b/installation/language/en-NZ/en-NZ.ini
@@ -0,0 +1,341 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+;Stepbar
+INSTL_STEP_COMPLETE_LABEL="Finish"
+INSTL_STEP_DATABASE_LABEL="Database"
+INSTL_STEP_DEFAULTLANGUAGE_LABEL="Choose Default Language"
+INSTL_STEP_FTP_LABEL="FTP"
+INSTL_STEP_LANGUAGES_LABEL="Install Languages"
+INSTL_STEP_SITE_LABEL="Configuration"
+INSTL_STEP_SUMMARY_LABEL="Overview"
+
+;Language view
+INSTL_SELECT_LANGUAGE_TITLE="Select Language"
+INSTL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper installation of Joomla!"
+INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to be installed!"
+
+;Preinstall view
+INSTL_PRECHECK_TITLE="Pre-Installation Check"
+INSTL_PRECHECK_DESC="If any of these items are not supported (marked as No) then please take actions to correct them.
You can't install Joomla! until your setup meets the requirements below." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Recommended settings:" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla.
However, Joomla! will still operate if your settings do not quite match the recommended configuration." +INSTL_PRECHECK_DIRECTIVE="Directive" +INSTL_PRECHECK_RECOMMENDED="Recommended" +INSTL_PRECHECK_ACTUAL="Actual" + +; Database view +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_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." +INSTL_DATABASE_OLD_PROCESS_DESC=""Backup" or "Remove" any existing tables from former Joomla! installations with the same "Table Prefix"." +INSTL_DATABASE_OLD_PROCESS_LABEL="Old Database Process" +INSTL_DATABASE_PASSWORD_DESC="For site security using a password for the database account is mandatory." +INSTL_DATABASE_PASSWORD_LABEL="Password" +INSTL_DATABASE_PREFIX_DESC="Create a table prefix or use the randomly generated one. Ideally four or five characters long, it may only contain alphanumeric characters and MUST end in an underscore. Make sure that the prefix chosen is not already used by other tables." +INSTL_DATABASE_PREFIX_LABEL="Table Prefix" +INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, be followed by optional alphanumeric characters and by an underscore" +INSTL_DATABASE_TYPE_DESC="This is probably "MySQLi"." +INSTL_DATABASE_TYPE_LABEL="Database Type" +INSTL_DATABASE_USER_DESC="Either a username you created or a username provided by your host." +INSTL_DATABASE_USER_LABEL="Username" + + +;FTP view +INSTL_AUTOFIND_FTP_PATH="Autofind FTP Path" +INSTL_FTP="FTP Configuration" +INSTL_FTP_DESC="
This will install sample content that is included in the Joomla! installation package." +INSTL_SITE_INSTALL_SAMPLE_NONE="None (Required for basic native multilingual site creation)" +INSTL_SAMPLE_BLOG_SET="Blog English (GB) Sample Data" +INSTL_SAMPLE_BROCHURE_SET="Brochure English (GB) Sample Data" +INSTL_SAMPLE_DATA_SET="Default English (GB) Sample Data" +INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Sample Data" +INSTL_SAMPLE_TESTING_SET="Test English (GB) Sample Data" +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content." +INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts." +INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom, Login Form." +INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form." +INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe how Joomla works." +INSTL_SAMPLE_TESTING_SET_DESC="Install Joomla with all possible menu items to help with testing Joomla." + +;Summary view +INSTL_FINALISATION="Finalisation" +INSTL_SUMMARY_INSTALL="Install" +INSTL_SUMMARY_EMAIL_LABEL="Email Configuration" +INSTL_SUMMARY_EMAIL_DESC="Send configuration settings to %s by email after installation." +INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Include Passwords in Email" +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Warning! It is recommended to not send and store your passwords in emails." + +;Installing view +INSTL_INSTALLING="Installing ..." +INSTL_INSTALLING_DATABASE_BACKUP="Backing up old database tables" +INSTL_INSTALLING_DATABASE_REMOVE="Removing old database tables" +INSTL_INSTALLING_DATABASE="Creating database tables" +INSTL_INSTALLING_SAMPLE="Installing sample data" +INSTL_INSTALLING_CONFIG="Creating configuration File" +INSTL_INSTALLING_EMAIL="Sending email to %s" + +;Email +INSTL_EMAIL_SUBJECT="Configuration Details: %s" +INSTL_EMAIL_HEADING="Below you can find the configuration settings for a newly setup Joomla! website:" +INSTL_EMAIL_NOT_SENT="Email could not be sent." + +;Complete view +INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administration Login Details" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="The installation folder has already been deleted." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation folder could not be deleted. Please manually delete the folder." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_FOLDER_REMOVED="Installation folder successfully removed." +INSTL_COMPLETE_LANGUAGE_1="Joomla! in your own language and/or automatic basic native multilingual site creation" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_LANGUAGE_DESC="Before removing the installation folder you can install extra languages. If you want to add extra languages to your Joomla! application select the following button." +INSTL_COMPLETE_LANGUAGE_DESC2="Note: you will need internet access for Joomla! to download and install the new languages.
Some server configurations won't allow Joomla! to install the languages. If this is your case, don't worry, you will be able to install them later using the Joomla! Administrator." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_FOLDER="Remove installation folder" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_INSTALLATION="PLEASE REMEMBER TO COMPLETELY REMOVE THE INSTALLATION FOLDER.
You will not be able to proceed beyond this point until the installation folder has been removed. This is a security feature of Joomla!" +INSTL_COMPLETE_TITLE="Congratulations! Joomla! is now installed." +INSTL_COMPLETE_INSTALL_LANGUAGES="Extra steps: Install languages" + +;Languages view +INSTL_LANGUAGES="Install Language packages" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Language" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Language Tag" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version" +INSTL_LANGUAGES_DESC="The Joomla interface is available in several languages. Choose your preferred languages by choosing the checkboxes and then install them by selecting the Next button.
Note: this operation will take about 10 seconds to download and install every language. To avoid timeouts please select no more than 3 languages to install." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="This operation will take up to 10 seconds per language to complete
Please wait while we download and install the languages ..." +INSTL_LANGUAGES_MORE_LANGUAGES="Press the 'Previous' button if you want to install more languages." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No languages have been selected to be installed. If you need to install more languages, press the 'Previous' button and choose the desired languages from the list." +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla was unable to connect to the languages server. Please finish the installation process." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla! Administrator" +INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step" + +;Default language view +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activate the multilingual feature" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="If active, your Joomla site will have the multilingual feature active with localised menus for each installed language." +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Enable the language code plugin" +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="If enabled, the language code plugin will add the ability to change the language code in the generated HTML document to improve SEO." +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Default Administrator language" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla was unable to set the language as default. English will be used as default language for the Backend Administrator." +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla has set %s as your default ADMINISTRATOR language." +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Select" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Language" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Tag" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ADD_ASSOCIATIONS="Joomla was unable to automatically create the language associations." +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla was unable to automatically create the %s content language." +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla was unable to automatically create the %s menu." +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla was unable to automatically create the %s home menu item." +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla was unable to automatically create the %s menu module." +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla was unable to automatically create the %s content category." +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla was unable to automatically create the %s localised article." +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla was unable to automatically publish the language switcher module." +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla was unable to automatically enable the Language Code Plugin." +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla was unable to automatically enable the Language Filter Plugin." +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla was unable to install %s language." +INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla was unable to automatically publish the language status module." +INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla was unable to automatically unpublish the default menu module." +INSTL_DEFAULTLANGUAGE_DESC="Joomla has installed the following languages. Please select your desired default language for the Joomla Administrator." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla has installed the following languages. Please select your desired default language for the Joomla Frontend." +INSTL_DEFAULTLANGUAGE_FRONTEND="Default Site language" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla was unable to set the language as default. English will be used as default language for the Frontend SITE." +INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla has set %s as your default SITE language." +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Install localised content" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="If active, Joomla will automatically create one content category per each installed language. Also, one featured article containing dummy content will be created on each category." +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingual" +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="This section allows you to automatically activate the Joomla! multilingual feature." +INSTL_DEFAULTLANGUAGE_TRY_LATER="You will be able to install it later using the Joomla! Administrator" + +; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="English (NZ)" + +;Database Model +INSTL_DATABASE_COULD_NOT_CONNECT="Could not connect to the database. Connector returned number: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="The installer could not connect to the specified database and was unable to create the database. Please verify your settings and if necessary manually create your database." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Could not refresh manifest cache for extension: %s" +INSTL_DATABASE_EMPTY_NAME="" +INSTL_DATABASE_ERROR_BACKINGUP="Some errors occurred in backing up the database." +INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.
The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla!" +INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database." +INSTL_DATABASE_FIELD_VALUE_REMOVE="Remove" +INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup" +INSTL_DATABASE_FIX_LOWERCASE="The table prefix must be lowercase for PostgreSQL." +INSTL_DATABASE_FIX_TOO_LONG="The MySQL table prefix must be a maximum of 15 characters." +INSTL_DATABASE_INVALID_DB_DETAILS="The database details provided are incorrect and/or empty." +INSTL_DATABASE_INVALID_MYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="You need PostgreSQL 8.3.18 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_TYPE="Please select the database type" +INSTL_DATABASE_NAME_TOO_LONG="The MySQL database name must be a maximum of 64 characters." +INSTL_DATABASE_INVALID_NAME="MySQL versions previous to 5.1.6 may not contain periods or other "special" characters in the name. Your version is: %s" +INSTL_DATABASE_NAME_INVALID_SPACES="MySQL database names and table names may not begin or end with spaces." +INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NULL ASCII(0x00)." +INSTL_DATABASE_FILE_DOES_NOT_EXIST="File %s does not exist" + +;controllers +INSTL_COOKIES_NOT_ENABLED="Cookies do not appear to be enabled on your browser client. You will not be able to install the application with this feature disabled. Alternatively, there could also be a problem with the server's session.save_path. If this is the case, please consult your hosting provider if you don't know how to check or fix this yourself." +INSTL_HEADER_ERROR="Error" + +;Helpers +INSTL_PAGE_TITLE="Joomla! Web Installer" + +;Configuration model +INSTL_ERROR_CONNECT_DB="Could not connect to the database. Connector returned number: %s" +INSTL_STD_OFFLINE_MSG="This site is down for maintenance.
Please check back again soon." + +;FTP model +INSTL_FTP_INVALIDROOT="The specified FTP Folder is not the folder of this Joomla! installation" +INSTL_FTP_NOCONNECT="Could not connect to the FTP server" +INSTL_FTP_NODELE="The function "DELE" failed." +INSTL_FTP_NODIRECTORYLISTING="Could not retrieve a folder listing from the FTP server." +INSTL_FTP_NOLIST="The function "LIST" failed." +INSTL_FTP_NOLOGIN="Could not log in to the FTP server." +INSTL_FTP_NOMKD="The function "MKD" failed." +INSTL_FTP_NONLST="The function "NLST" failed." +INSTL_FTP_NOPWD="The function "PWD" failed." +INSTL_FTP_NORETR="The function "RETR" failed." +INSTL_FTP_NORMD="The function "RMD" failed." +INSTL_FTP_NOROOT="Could not access the specified FTP folder." +INSTL_FTP_NOSTOR="The function "STOR" failed." +INSTL_FTP_NOSYST="The function "SYST" failed." +INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Unable to auto-detect the FTP root folder." + +;others +INSTL_CONFPROBLEM="Your configuration file or folder is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." +INSTL_DATABASE_SUPPORT="Database Support:" +INSTL_DISPLAY_ERRORS="Display Errors" +INSTL_ERROR_DB="Some errors occurred while populating the database: %s" +INSTL_ERROR_INITIALISE_SCHEMA="Can't initialise database schema" +INSTL_FILE_UPLOADS="File Uploads" +INSTL_GNU_GPL_LICENSE="GNU General Public License" +INSTL_JSON_SUPPORT_AVAILABLE="JSON Support" +INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off" +INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime" +INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default" +INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off" +INSTL_MCRYPT_SUPPORT_AVAILABLE="Mcrypt Support" +INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering php_value mbstring.language neutral in your
You can still continue the installation as the configuration settings will be displayed at the end. You will have to manually upload the code. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." +INSTL_OUTPUT_BUFFERING="Output Buffering" +INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support" +INSTL_PHP_VERSION="PHP Version" +INSTL_PHP_VERSION_NEWER="PHP Version >= %s" +INSTL_REGISTER_GLOBALS="Register Globals Off" +INSTL_SAFE_MODE="Safe Mode" +INSTL_SESSION_AUTO_START="Session Auto Start" +INSTL_WRITABLE="%s Writeable" +INSTL_XML_SUPPORT="XML Support" +INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP support" +INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib Compression Support" +INSTL_PROCESS_BUSY="Process is in progress. Please wait ..." + +;Global strings +JADMINISTRATOR="Administrator" +JCHECK_AGAIN="Check Again" +JERROR="Error" +JEMAIL="Email" +JGLOBAL_ISFREESOFTWARE="%s is free software released under the %s." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Language pack does not match this Joomla! version. Some strings may be missing and will be displayed in English." +JGLOBAL_SELECT_AN_OPTION="Select an option" +JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match" +JGLOBAL_SELECT_SOME_OPTIONS="Select some options" +JINVALID_TOKEN="The most recent request was denied because it contained an invalid security token. Please refresh the page and try again." +JNEXT="Next" +JNO="No" +JNOTICE="Notice" +JOFF="Off" +JON="On" +JPREVIOUS="Previous" +JSITE="Site" +JUSERNAME="Username" +JYES="Yes" + +; Framework strings necessary when no lang pack is available +JLIB_DATABASE_ERROR_CONNECT_MYSQL="Could not connect to MySQL." +JLIB_DATABASE_ERROR_DATABASE="A Database error occurred." +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s" +JLIB_ENVIRONMENT_SESSION_EXPIRED="Your session has expired, please reload the page." +JLIB_FILESYSTEM_ERROR_COPY_FAILED="Copy failed" +JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Path is not a folder. Path: %s" +JLIB_FORM_FIELD_INVALID="Invalid field: " +JLIB_FORM_VALIDATE_FIELD_INVALID="Invalid field: %s" +JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s" +JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file %1$s to %2$s." +JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla! 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed." +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database
joomla.library: %1$s - %2$s" + +; Strings for the language debugger +JDEBUG_LANGUAGE_FILES_IN_ERROR="Parsing errors in language files" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Untranslated strings" +JNONE="None" + +; Necessary for errors +ADMIN_EMAIL="Administrator Email" +ADMIN_PASSWORD="Administrator Password" +ADMIN_PASSWORD2="Confirm Administrator Password" +SITE_NAME="Site Name" + +; Database types (allows for a more descriptive label than the internal name) +MYSQL="MySQL" +MYSQLI="MySQLi" +ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" +POSTGRESQL="PostgreSQL" +SQLAZURE="Microsoft SQL Azure" +SQLITE="SQLite" +SQLSRV="Microsoft SQL Server" + +; Javascript message titles +ERROR="Error" +MESSAGE="Message" +NOTICE="Notice" +WARNING="Warning" + +; Javascript ajax error messages +JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection abort has occurred while fetching the JSON data." +JLIB_JS_AJAX_ERROR_NO_CONTENT="No content was returned." +JLIB_JS_AJAX_ERROR_OTHER="An error has occurred while fetching the JSON data: HTTP %s status code." +JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:
+ English (New Zealand)
+ 3.6.3
+ October 2016
+ Joomla! Project
+ Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
+ GNU General Public License version 2 or later; see LICENSE.txt
+
+ en-NZ.ini
+
+
+ English (New Zealand)
+ en-NZ
+ 0
+
+
diff --git a/installation/language/en-US/en-US.ini b/installation/language/en-US/en-US.ini
index 071731c6e54f9..eb34eb162ec01 100644
--- a/installation/language/en-US/en-US.ini
+++ b/installation/language/en-US/en-US.ini
@@ -95,7 +95,7 @@ INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe
INSTL_SAMPLE_TESTING_SET_DESC="Install Joomla with all possible menu items to help with testing Joomla."
;Summary view
-INSTL_FINALISATION="Finalisation"
+INSTL_FINALISATION="Finalization"
INSTL_SUMMARY_INSTALL="Install"
INSTL_SUMMARY_EMAIL_LABEL="Email Configuration"
INSTL_SUMMARY_EMAIL_DESC="Send configuration settings to %s by email after installation."
@@ -150,7 +150,7 @@ INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step"
;Default language view
INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activate the multilingual feature"
-INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="If active, your Joomla site will have the multilingual feature active with localised menus for each installed language."
+INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="If active, your Joomla site will have the multilingual feature active with localized menus for each installed language."
INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Enable the language code plugin"
INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="If enabled, the language code plugin will add the ability to change the language code in the generated HTML document to improve SEO."
INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Default Administrator language"
@@ -165,7 +165,7 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla was unable to automatically
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla was unable to automatically create the %s home menu item."
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla was unable to automatically create the %s menu module."
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla was unable to automatically create the %s content category."
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla was unable to automatically create the %s localised article."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla was unable to automatically create the %s localized article."
INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla was unable to automatically publish the language switcher module."
INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla was unable to automatically enable the Language Code Plugin."
INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla was unable to automatically enable the Language Filter Plugin."
@@ -177,7 +177,7 @@ INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla has installed the following language
INSTL_DEFAULTLANGUAGE_FRONTEND="Default Site language"
INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla was unable to set the language as default. English will be used as default language for the Frontend SITE."
INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla has set %s as your default SITE language."
-INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Install localised content"
+INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Install localized content"
INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="If active, Joomla will automatically create one content category per each installed language. Also, one featured article containing dummy content will be created on each category."
INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingual"
INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="This section allows you to automatically activate the Joomla! multilingual feature."
diff --git a/installation/language/fa-IR/fa-IR.ini b/installation/language/fa-IR/fa-IR.ini
index 734e9a95f0db6..d5d2860f48c9a 100644
--- a/installation/language/fa-IR/fa-IR.ini
+++ b/installation/language/fa-IR/fa-IR.ini
@@ -1,6 +1,5 @@
; Joomla! Project
; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
-; Copyright (C) Translation 2010 - 2016 Joomla Farsi www.JoomlaFarsi.com. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt
; Note : All ini files need to be saved as UTF-8
diff --git a/installation/language/fr-CA/fr-CA.ini b/installation/language/fr-CA/fr-CA.ini
index f10236051c3d2..474938822ec66 100644
--- a/installation/language/fr-CA/fr-CA.ini
+++ b/installation/language/fr-CA/fr-CA.ini
@@ -66,7 +66,7 @@ INSTL_FTP_PASSWORD_DESC="Il est vivement conseillé de laisser cette zone vide e
;Site View
INSTL_SITE="Configuration principale"
-INSTL_ADMIN_EMAIL_LABEL="E-mail"
+INSTL_ADMIN_EMAIL_LABEL="Courriel"
INSTL_ADMIN_EMAIL_DESC="Indiquez l'adresse email liée à ce compte "_QQ_"Super Utilisateur"_QQ_"."
INSTL_ADMIN_PASSWORD_LABEL="Mot de passe"
INSTL_ADMIN_PASSWORD_DESC="Définissez le mot de passe de ce compte et confirmez-le ci-dessous."
@@ -98,9 +98,9 @@ INSTL_SAMPLE_TESTING_SET_DESC="Installer Joomla avec tous les liens de menu poss
INSTL_FINALISATION="Finalisation"
INSTL_SUMMARY_INSTALL="Installer"
INSTL_SUMMARY_EMAIL_LABEL="Envoi de la configuration"
-INSTL_SUMMARY_EMAIL_DESC="Choisissez si vous souhaitez envoyer un e-mail après installation avec les données de configuration à l'adresse %s."
-INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Inclure le mot de passe dans l'e-mail"
-INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Attention! Il est recommandé de ne pas envoyer le mot de passe par e-mail et de le stocker de manière sécurisée."
+INSTL_SUMMARY_EMAIL_DESC="Choisissez si vous souhaitez envoyer un courriel après installation avec les données de configuration à l'adresse %s."
+INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Inclure le mot de passe dans le courriel"
+INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Attention! Il est recommandé de ne pas envoyer le mot de passe par courriel et de le stocker de manière sécurisée."
;Installing view
INSTL_INSTALLING="Installation..."
@@ -109,12 +109,12 @@ INSTL_INSTALLING_DATABASE_REMOVE="Suppression des tables de l'ancienne installat
INSTL_INSTALLING_DATABASE="Création des tables de Joomla! dans la base de données"
INSTL_INSTALLING_SAMPLE="Installation des données exemples choisies"
INSTL_INSTALLING_CONFIG="Création du fichier de configuration"
-INSTL_INSTALLING_EMAIL="Envoi de l'e-mail à %s"
+INSTL_INSTALLING_EMAIL="Envoi du courrriel à %s"
;Email
INSTL_EMAIL_SUBJECT="Détails de configuration: %s"
INSTL_EMAIL_HEADING="Paramètres de configuration de votre nouveau site Joomla! :"
-INSTL_EMAIL_NOT_SENT="L'e-mail n'a pas pu être envoyé."
+INSTL_EMAIL_NOT_SENT="Le courriel n'a pas pu être envoyé."
;Complete view
INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Détails de connexion à l'administration"
@@ -275,9 +275,9 @@ INSTL_PROCESS_BUSY="Processus en cours. Veuillez patienter..."
JADMINISTRATOR="Administration"
JCHECK_AGAIN="Vérifier à nouveau"
JERROR="Erreur"
-JEMAIL="E-mail"
+JEMAIL="Courriel"
JGLOBAL_ISFREESOFTWARE="%s est un logiciel libre sous %s"
-JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Le paquet de langue ne coincïde pas avec cette version de Joomla!. Certaines chaines peuvent manquer et seront affichées en anglais."
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Le paquet de langue ne coïncide pas avec cette version de Joomla!. Certaines chaines peuvent manquer et seront affichées en anglais."
JGLOBAL_SELECT_AN_OPTION="Sélectionner une option"
JGLOBAL_SELECT_NO_RESULTS_MATCH="Aucun résultat correspondant"
JGLOBAL_SELECT_SOME_OPTIONS="Sélectionner certaines options"
@@ -312,7 +312,7 @@ JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Chaines non traduites"
JNONE="Aucune"
; Necessary for errors
-ADMIN_EMAIL="Votre e-mail"
+ADMIN_EMAIL="Votre adresse email"
ADMIN_PASSWORD="Mot de passe de l'admin"
ADMIN_PASSWORD2="Confirmer le mot de passe admin"
SITE_NAME="Nom du site"
@@ -339,16 +339,3 @@ JLIB_JS_AJAX_ERROR_NO_CONTENT="Aucun contenu obtenu."
JLIB_JS_AJAX_ERROR_OTHER="Une erreur s'est produite lors de la récupération des données JSON: HTTP %s status code."
JLIB_JS_AJAX_ERROR_PARSE="Une erreur de parsing s'est produite lors de la récupération des données JSON suivantes :
Nederlands nl-NL
- 3.6.1
- July 2016
+ 3.6.3
+ October 2016
Dutch Translation Team
Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/sk-SK/sk-SK.ini b/installation/language/sk-SK/sk-SK.ini
index 8c78093d10a03..ecb3614874780 100644
--- a/installation/language/sk-SK/sk-SK.ini
+++ b/installation/language/sk-SK/sk-SK.ini
@@ -44,7 +44,7 @@ INSTL_DATABASE_PREFIX_MSG="Predpona názvu tabuľky musà zaÄÃnaÅ¥ pÃsmenom,
INSTL_DATABASE_TYPE_DESC="Toto je pravdepodobne "_QQ_"MySQLi"_QQ_""
INSTL_DATABASE_TYPE_LABEL="Typ databázy"
INSTL_DATABASE_USER_DESC="BuÄ vami vytvorené použÃvateľské meno alebo použÃvateľské meno poskytnuté hostingom."
-INSTL_DATABASE_USER_LABEL="Meno užÃvateľa"
+INSTL_DATABASE_USER_LABEL="Meno použÃvateľa"
;FTP view
@@ -57,11 +57,11 @@ INSTL_FTP_PASSWORD_LABEL="Heslo FTP úÄtu"
INSTL_FTP_PORT_LABEL="Port FTP"
INSTL_FTP_ROOT_LABEL="Cesta do hlavného adresára FTP"
INSTL_FTP_SAVE_LABEL="UložiÅ¥ heslo k FTP úÄtu"
-INSTL_FTP_TITLE="Nastavenia úÄtu FTP (Voliteľné - VäÄÅ¡ina užÃvateľov môže tento krok preskoÄiÅ¥ - StlaÄte ÄŽalej pre preskoÄenie na ÄalÅ¡Ã krok)"
-INSTL_FTP_USER_LABEL="UžÃvateľské meno FTP úÄtu"
+INSTL_FTP_TITLE="Nastavenia úÄtu FTP (Voliteľné - VäÄÅ¡ina použÃvateľov môže tento krok preskoÄiÅ¥ - StlaÄte ÄŽalej pre preskoÄenie na ÄalÅ¡Ã krok)"
+INSTL_FTP_USER_LABEL="PoužÃvateľské meno FTP úÄtu"
INSTL_VERIFY_FTP_SETTINGS="Overiť nastavenia FTP"
INSTL_FTP_SETTINGS_CORRECT="Nastavenia sú správne"
-INSTL_FTP_USER_DESC="Pozor! OdporúÄame nechaÅ¥ toto pole prázdne a zadávaÅ¥ užÃvateľské meno FTP úÄtu vždy, keÄ prenášate súbory."
+INSTL_FTP_USER_DESC="Pozor! OdporúÄame nechaÅ¥ toto pole prázdne a zadávaÅ¥ použÃvateľské meno FTP úÄtu vždy, keÄ prenášate súbory."
INSTL_FTP_PASSWORD_DESC="Pozor! OdporúÄame nechaÅ¥ toto pole prázdne a zadávaÅ¥ heslo FTP úÄtu vždy, keÄ prenášate súbory."
;Site View
@@ -71,7 +71,7 @@ INSTL_ADMIN_EMAIL_DESC="Zadajte e-mailovú adresu. Bude to zároveň e-mailová
INSTL_ADMIN_PASSWORD_LABEL="Heslo administrátora"
INSTL_ADMIN_PASSWORD_DESC="Zadajte heslo vášho administrátorského úÄtu a potvrÄte ho v poli nižšie."
INSTL_ADMIN_PASSWORD2_LABEL="Overenie hesla administrátora"
-INSTL_ADMIN_USER_LABEL="UžÃvateľské meno administrátora"
+INSTL_ADMIN_USER_LABEL="PoužÃvateľské meno administrátora"
INSTL_ADMIN_USER_DESC="Nastavte uživateľské meno vášho administrátorského úÄtu."
INSTL_SITE_NAME_LABEL="Názov webu"
INSTL_SITE_NAME_DESC="Zadajte názov vašich webových stránok so systémom Joomla!."
@@ -192,7 +192,7 @@ INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Inštalátor sa nevie spojiť so zadan
INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Nemôžem obnoviÅ¥ vyrovnávaciu pamäť manifestu pre rozÅ¡Ãrenie: %s"
INSTL_DATABASE_EMPTY_NAME=""
INSTL_DATABASE_ERROR_BACKINGUP="PoÄas zálohovania databázy doÅ¡lo k chybám."
-INSTL_DATABASE_ERROR_CREATE="PoÄas pokusu vytvoriÅ¥ databázu %s doÅ¡lo k chybe.
UžÃvateľ asi nemá dostatoÄné oprávnenia na vytvorenie databázy. Požadovaná databáza môže byÅ¥ vytvorená osobitne pred zaÄatÃm inÅ¡talácie systému Joomla!." +INSTL_DATABASE_ERROR_CREATE="PoÄas pokusu vytvoriÅ¥ databázu %s doÅ¡lo k chybe.
PožÃvateľ asi nemá dostatoÄné oprávnenia na vytvorenie databázy. Požadovaná databáza môže byÅ¥ vytvorená osobitne pred zaÄatÃm inÅ¡talácie systému Joomla!." INSTL_DATABASE_ERROR_DELETE="PoÄas mazania databázy doÅ¡lo k chybám." INSTL_DATABASE_FIELD_VALUE_REMOVE="OdstrániÅ¥" INSTL_DATABASE_FIELD_VALUE_BACKUP="ZálohovaÅ¥" @@ -289,7 +289,7 @@ JOFF="Vyp." JON="Zap." JPREVIOUS="Späť" JSITE="Web" -JUSERNAME="Meno užÃvateľa" +JUSERNAME="Meno použÃvateľa" JYES="Ãno" ; Framework strings necessary when no lang pack is available diff --git a/installation/model/database.php b/installation/model/database.php index b9a5755468de9..1aa1ce80129ee 100644 --- a/installation/model/database.php +++ b/installation/model/database.php @@ -90,7 +90,7 @@ public static function getUserId() */ public function initialise($options) { - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Load the backend language files so that the DB error messages work. @@ -214,7 +214,7 @@ public function createDatabase($options) return false; } - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Check database version. @@ -428,7 +428,7 @@ public function handleOldDatabase($options) return false; } - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Set the character set to UTF-8 for pre-existing databases. @@ -477,7 +477,7 @@ public function createTables($options) return false; } - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Check database type. @@ -716,7 +716,7 @@ public function installSampleData($options) return false; } - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Build the path to the sample data file. diff --git a/installation/model/ftp.php b/installation/model/ftp.php index d2cac2e55f3a4..2e8c23c088fbf 100644 --- a/installation/model/ftp.php +++ b/installation/model/ftp.php @@ -29,7 +29,7 @@ class InstallationModelFtp extends JModelBase */ public function detectFtpRoot($options) { - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Connect and login to the FTP server. @@ -148,7 +148,7 @@ public function detectFtpRoot($options) */ public function verifyFtpSettings($options) { - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Connect and login to the FTP server. diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index 6a8c65164bd39..e9ac270eff6d6 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -621,10 +621,10 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder` (504, 'hathor', 'template', 'hathor', '', 1, 1, 1, 0, '', '{"showSiteName":"0","colourChoice":"0","boldText":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (506, 'protostar', 'template', 'protostar', '', 0, 1, 1, 0, '', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (507, 'isis', 'template', 'isis', '', 1, 1, 1, 0, '', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(600, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(601, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(802, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0); +(802, 'English (en-GB) Language Pack', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0); -- -------------------------------------------------------- @@ -1212,7 +1212,7 @@ CREATE TABLE IF NOT EXISTS `#__languages` ( -- INSERT INTO `#__languages` (`lang_id`, `lang_code`, `title`, `title_native`, `sef`, `image`, `description`, `metakey`, `metadesc`, `sitename`, `published`, `access`, `ordering`) VALUES -(1, 'en-GB', 'English (UK)', 'English (UK)', 'en', 'en_gb', '', '', '', '', 1, 1, 1); +(1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1); -- -------------------------------------------------------- diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index 958123450d787..231c45b6271ab 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -627,8 +627,8 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder" -- Languages INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES -(600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); +(600, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(601, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); -- Files Extensions INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES @@ -636,7 +636,7 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder" -- Packages INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES -(802, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); +(802, 'English (en-GB) Language Pack', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); SELECT setval('#__extensions_extension_id_seq', 10000, false); @@ -1148,7 +1148,7 @@ CREATE INDEX "#__languages_idx_access" ON "#__languages" ("access"); -- Dumping data for table #__languages -- INSERT INTO "#__languages" ("lang_id", "lang_code", "title", "title_native", "sef", "image", "description", "metakey", "metadesc", "sitename", "published", "access", "ordering") VALUES -(1, 'en-GB', 'English (UK)', 'English (UK)', 'en', 'en_gb', '', '', '', '', 1, 1, 1); +(1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1); SELECT setval('#__languages_lang_id_seq', 2, false); diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql index d8e87745db9db..336a90f8d0a8c 100644 --- a/installation/sql/sqlazure/joomla.sql +++ b/installation/sql/sqlazure/joomla.sql @@ -1030,9 +1030,9 @@ SELECT 507, 'isis', 'template', 'isis', '', 1, 1, 1, 0, '', '{"templateColor":"" -- Languages INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) -SELECT 600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0 +SELECT 600, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0 UNION ALL -SELECT 601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; +SELECT 601, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; -- Files Extensions INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) @@ -1040,7 +1040,7 @@ SELECT 700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, -- Packages INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) -SELECT 802, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; +SELECT 802, 'English (en-GB) Language Pack', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; SET IDENTITY_INSERT [#__extensions] OFF; @@ -2016,7 +2016,7 @@ CREATE UNIQUE INDEX [idx_access] ON [#__languages] SET IDENTITY_INSERT [#__languages] ON; INSERT INTO [#__languages] ([lang_id], [lang_code], [title], [title_native], [sef], [image], [description], [metakey], [metadesc], [sitename], [published], [access], [ordering]) -SELECT 1, 'en-GB', 'English (UK)', 'English (UK)', 'en', 'en_gb', '', '', '', '', 1, 1, 1; +SELECT 1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1; SET IDENTITY_INSERT [#__languages] OFF; diff --git a/installation/template/css/template.css b/installation/template/css/template.css index 6254a80476f34..730694a901fc2 100644 --- a/installation/template/css/template.css +++ b/installation/template/css/template.css @@ -131,3 +131,86 @@ textarea.noResize { .tooltip { white-space: pre-wrap; } + +/* Flat Repaint */ +.btn { + background-image: none; + border: 1px solid rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} +.btn-primary:hover, .btn-primary:focus { + background-color: #185b91; + color: #fff; + text-decoration: none; +} +.chzn-container-single .chzn-single { + background-color: #ffffff; + background-image: none; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 3px; + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); + height: auto; + line-height: 26px; +} +.chzn-container-single .chzn-single div { + background-color: #f3f3f3; + border-left: 1px solid #cccccc; + text-align: center; + width: 28px; + height: auto; + bottom: 0; +} +.chzn-container-single .chzn-drop { + background-clip: padding-box; + border-color: #0088cc; +} +.chzn-container-active .chzn-single { + color: #0088cc; +} +.chzn-container-active.chzn-with-drop .chzn-single div { + border-bottom: 1px solid #cccccc; + border-bottom-left-radius: 3px; + background-color: #f3f3f3; + border-left: 1px solid #cccccc; +} +.chzn-container-single .chzn-single div b { + background-position: 2px 2px; + display: inline-block; + height: 16px; + width: 16px; +} +.chzn-container-active.chzn-with-drop .chzn-single div b { + background-position: -16px 2px; +} +.chzn-container-active.chzn-with-drop .chzn-single { + background-image: none; + border: 1px solid #0088cc; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} + +.chzn-container .chzn-results { + background-color: #fff; + border-radius: 0 0 3px 3px; + margin: 0; + padding: 0; +} +.chzn-container-single .chzn-search input[type="text"] { + border: 1px solid #aaa; + border-radius: 3px; + box-shadow: none; + background: transparent url("../../../media/jui/css/chosen-sprite.png") no-repeat scroll 100% -20px +} +.chzn-container .chzn-results li.highlighted { + background-color: #0088cc; + background-image: none; +} +.chzn-container-single .chzn-search input[type="text"]:focus { + border-color: #0088cc; +} +fieldset { + margin-bottom: 10px; +} +textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input { + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); +} diff --git a/installation/template/index.php b/installation/template/index.php index b290bcdfd8569..c85e99d1fe45f 100644 --- a/installation/template/index.php +++ b/installation/template/index.php @@ -10,10 +10,6 @@ /** @var JDocumentHtml $this */ -// Add Stylesheets -JHtml::_('bootstrap.loadCss', true, $this->direction); -JHtml::_('stylesheet', 'installation/template/css/template.css'); - // Load the JavaScript behaviors JHtml::_('bootstrap.framework'); JHtml::_('formbehavior.chosen', 'select'); @@ -21,6 +17,10 @@ JHtml::_('behavior.formvalidator'); JHtml::_('script', 'installation/template/js/installation.js'); +// Add Stylesheets +JHtml::_('bootstrap.loadCss', true, $this->direction); +JHtml::_('stylesheet', 'installation/template/css/template.css'); + // Load JavaScript message titles JText::script('ERROR'); JText::script('WARNING'); diff --git a/language/en-GB/en-GB.com_contact.ini b/language/en-GB/en-GB.com_contact.ini index 26fb09a4d1805..3948802802169 100644 --- a/language/en-GB/en-GB.com_contact.ini +++ b/language/en-GB/en-GB.com_contact.ini @@ -10,7 +10,7 @@ COM_CONTACT_CAPTCHA_DESC="Please complete the security check." COM_CONTACT_CAT_NUM="# of Contacts :" COM_CONTACT_CONTACT_DEFAULT_LABEL="Send an Email" COM_CONTACT_CONTACT_EMAIL_A_COPY_DESC="Sends a copy of the message to the address you have supplied." -COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL="Send copy to yourself" +COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL="Send a copy to yourself" COM_CONTACT_CONTACT_EMAIL_NAME_DESC="Your name." COM_CONTACT_CONTACT_EMAIL_NAME_LABEL="Name" COM_CONTACT_CONTACT_ENTER_MESSAGE_DESC="Enter your message here." diff --git a/language/en-GB/en-GB.com_media.ini b/language/en-GB/en-GB.com_media.ini index 6734833c394ef..5befff0ce864a 100644 --- a/language/en-GB/en-GB.com_media.ini +++ b/language/en-GB/en-GB.com_media.ini @@ -71,6 +71,4 @@ COM_MEDIA_UP="Up" COM_MEDIA_UPLOAD="Upload" COM_MEDIA_UPLOAD_COMPLETE="Upload Complete" COM_MEDIA_UPLOAD_FILE="Upload file" -COM_MEDIA_UPLOAD_FILES="Upload files (Maximum Size: %s MB)" -COM_MEDIA_UPLOAD_FILES_NOLIMIT="Upload files (No maximum size)" COM_MEDIA_UPLOAD_SUCCESSFUL="Upload Successful" diff --git a/language/en-GB/en-GB.com_users.ini b/language/en-GB/en-GB.com_users.ini index fc3453aa3fb30..ecd22d3b91415 100644 --- a/language/en-GB/en-GB.com_users.ini +++ b/language/en-GB/en-GB.com_users.ini @@ -70,7 +70,7 @@ COM_USERS_PROFILE_EMAIL1_DESC="Enter your email address." COM_USERS_PROFILE_EMAIL1_LABEL="Email Address" COM_USERS_PROFILE_EMAIL1_MESSAGE="The email address you entered is already in use or invalid. Please enter another email address." COM_USERS_PROFILE_EMAIL2_DESC="Confirm your email address." -COM_USERS_PROFILE_EMAIL2_LABEL="Confirm email Address" +COM_USERS_PROFILE_EMAIL2_LABEL="Confirm Email Address" COM_USERS_PROFILE_EMAIL2_MESSAGE="The email addresses you entered do not match. Please enter your email address in the email address field and confirm your entry by entering it in the confirm email address field." COM_USERS_PROFILE_LAST_VISITED_DATE_LABEL="Last Visited Date" COM_USERS_PROFILE_MY_PROFILE="My Profile" @@ -101,7 +101,7 @@ COM_USERS_REGISTER_EMAIL1_DESC="Enter your email address." COM_USERS_REGISTER_EMAIL1_LABEL="Email Address" COM_USERS_REGISTER_EMAIL1_MESSAGE="The email address you entered is already in use or invalid. Please enter another email address." COM_USERS_REGISTER_EMAIL2_DESC="Confirm your email address." -COM_USERS_REGISTER_EMAIL2_LABEL="Confirm email Address" +COM_USERS_REGISTER_EMAIL2_LABEL="Confirm Email Address" COM_USERS_REGISTER_EMAIL2_MESSAGE="The email addresses you entered do not match. Please enter your email address in the email address field and confirm your entry by entering it in the confirm email address field." COM_USERS_REGISTER_NAME_DESC="Enter your full name." COM_USERS_REGISTER_NAME_LABEL="Name" diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini index 6dcacb0d8cd26..932947d277e03 100644 --- a/language/en-GB/en-GB.ini +++ b/language/en-GB/en-GB.ini @@ -234,6 +234,7 @@ JGLOBAL_KEEP_TYPING="Keep typing ..." JGLOBAL_LEFT="Left" JGLOBAL_LOOKING_FOR="Looking for" JGLOBAL_LT="<" +JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT="Maximum upload size: %s" JGLOBAL_NEWITEMSLAST_DESC="New items default to the last position. Ordering can be changed after this item has been saved." JGLOBAL_NO_MATCHING_RESULTS="No Matching Results" JGLOBAL_NUM="#" diff --git a/language/en-GB/en-GB.tpl_protostar.ini b/language/en-GB/en-GB.tpl_protostar.ini index 0d7ec7e1e582d..15697fbd53ee6 100644 --- a/language/en-GB/en-GB.tpl_protostar.ini +++ b/language/en-GB/en-GB.tpl_protostar.ini @@ -20,4 +20,5 @@ TPL_PROTOSTAR_FONT_NAME_DESC="Example: Open+Sans or Source+Sans+Pro." TPL_PROTOSTAR_LOGO_LABEL="Logo" TPL_PROTOSTAR_LOGO_DESC="Select or upload a custom logo for the site template." TPL_PROTOSTAR_STATIC="Static" +TPL_PROTOSTAR_TOGGLE_MENU="Toggle Navigation" diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index 691eb433b5e35..ae53d68e42998 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -1,7 +1,7 @@
English (en-GB)
- 3.6.3
+ 3.6.4
October 2016
Joomla! Project
admin@joomla.org
@@ -11,11 +11,13 @@
English (en-GB)
+ English (United Kingdom)
en-GB
0
en_GB.utf8, en_GB.UTF-8, en_GB, eng_GB, en, english, english-uk, uk, gbr, britain, england, great britain, uk, united kingdom, united-kingdom
0
0,6
+ gregorian
diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
index 2dca168fae4db..2c11420eca3d0 100644
--- a/language/en-GB/install.xml
+++ b/language/en-GB/install.xml
@@ -1,8 +1,8 @@
- English (United Kingdom)
+ English (en-GB)
en-GB
- 3.6.3
+ 3.6.4
October 2016
Joomla! Project
admin@joomla.org
diff --git a/layouts/joomla/content/blog_style_default_item_title.php b/layouts/joomla/content/blog_style_default_item_title.php
index ec8389ba85924..524f77b078f0b 100644
--- a/layouts/joomla/content/blog_style_default_item_title.php
+++ b/layouts/joomla/content/blog_style_default_item_title.php
@@ -15,7 +15,7 @@
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
?>
-get('show_title') || $displayData->state == 0 || ($params->get('show_author') && !empty($displayData->author ))) : ?>
+state == 0 || $params->get('show_title') || ($params->get('show_author') && !empty($displayData->author ))) : ?>
params->get('admin_menus') != '0') : ?>
+
diff --git a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
index 30deb1339cd5d..8381b86c329ef 100644
--- a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
+++ b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
@@ -37,6 +37,7 @@ TPL_ISIS_STATUS_LABEL="Status Module Position"
TPL_ISIS_STATUS_TOP="Top"
TPL_ISIS_STICKY_DESC="Optionally set the toolbar to a fixed (pinned) location."
TPL_ISIS_STICKY_LABEL="Pinned Toolbar"
+TPL_ISIS_TOGGLE_MENU="Toggle Navigation"
TPL_ISIS_TOOLBAR="Toolbar"
TPL_ISIS_USERMENU="User Menu"
TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."
diff --git a/administrator/templates/isis/less/bootstrap/buttons.less b/administrator/templates/isis/less/bootstrap/buttons.less
index 7f6a2481074d0..e6714d250fe91 100644
--- a/administrator/templates/isis/less/bootstrap/buttons.less
+++ b/administrator/templates/isis/less/bootstrap/buttons.less
@@ -165,6 +165,7 @@ input[type="button"] {
&:hover,
&:focus {
background-color: darken(@btnWarningBackground, 15%);
+ color: #fff;
text-decoration: none;
text-shadow: none;
}
@@ -178,6 +179,7 @@ input[type="button"] {
&:hover,
&:focus {
background-color: darken(@btnDangerBackground, 15%);
+ color: #fff;
text-decoration: none;
}
}
@@ -190,6 +192,7 @@ input[type="button"] {
&:hover,
&:focus {
background-color: darken(@btnSuccessBackground, 15%);
+ color: #fff;
text-decoration: none;
}
}
@@ -202,6 +205,7 @@ input[type="button"] {
&:hover,
&:focus {
background-color: darken(@btnInfoBackground, 15%);
+ color: #fff;
text-decoration: none;
}
}
@@ -214,6 +218,7 @@ input[type="button"] {
&:hover,
&:focus {
background-color: darken(@btnInverseBackground, 15%);
+ color: #fff;
text-decoration: none;
}
}
diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less
index edbe1ab2f3096..20fd05f419564 100644
--- a/administrator/templates/isis/less/template.less
+++ b/administrator/templates/isis/less/template.less
@@ -136,6 +136,15 @@ a:focus {
.input-medium {
width: 176px;
}
+ #lang_chzn {
+ width: 233px !important;
+ .chzn-single div {
+ width:43px;
+ }
+ }
+ .input-prepend .add-on, .controls .btn-group > .btn {
+ margin-left:0;
+ }
}
.navbar-inverse {
@@ -143,14 +152,6 @@ a:focus {
}
.login {
- .chzn-single {
- width: 222px !important;
- }
- .chzn-container,
- .chzn-drop {
- width: 230px !important;
- max-width: 230px !important;
- }
.btn-large {
margin-top: 15px;
}
@@ -1200,8 +1201,14 @@ th .tooltip-inner {
opacity: 1;
}
/* Permissions dropdown display */
-#permissions-sliders .chzn-container {
- position: absolute;
+#permissions-sliders {
+ .chzn-container {
+ margin-top: -5px;
+ position: absolute;
+ }
+ .table td {
+ padding: 8px 8px 9px;
+ }
}
/* Component pop-up */
.container-popup {
@@ -1505,3 +1512,29 @@ body.modal-open {
border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
}
+/* Removes Text Shadows */
+.alert,
+.alert-options,
+.badge,
+.breadcrumb > li,
+.close,
+.input-append .add-on,
+.input-prepend .add-on,
+.label,
+.nav-header,
+.nav-list .nav-header,
+.nav-list > .active > a,
+.nav-list > .active > a:focus,
+.nav-list > .active > a:hover,
+.nav-list > li > a,
+.nav-tabs.nav-dark,
+.navbar .brand,
+.navbar .nav > li > a,
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a,
+.navbar-inverse .navbar-search .search-query.focused,
+.navbar-inverse .navbar-search .search-query:focus,
+.progress .bar,
+.subhead {
+ text-shadow: none;
+}
\ No newline at end of file
diff --git a/build/build.php b/build/build.php
index 0a635f31bd126..985831381d278 100644
--- a/build/build.php
+++ b/build/build.php
@@ -99,6 +99,7 @@
* These paths are from the repository root without the leading slash
*/
$doNotPackage = array(
+ '.drone.yml',
'.github',
'.gitignore',
'.php_cs',
@@ -108,10 +109,10 @@
'build.xml',
'composer.json',
'composer.lock',
+ 'karma.conf.js',
'phpunit.xml.dist',
'tests',
'travisci-phpunit.xml',
- 'karma.conf.js',
// Remove the testing sample data from all packages
'installation/sql/mysql/sample_testing.sql',
'installation/sql/postgresql/sample_testing.sql',
diff --git a/build/helpTOC.php b/build/helpTOC.php
index 342d6aa4615f8..fec7f797776ce 100644
--- a/build/helpTOC.php
+++ b/build/helpTOC.php
@@ -56,7 +56,7 @@ public function doExecute()
$namespace = 'Help' . $helpVersion . ':';
// Set up options for JMediawiki
- $options = new JRegistry;
+ $options = new Joomla\Registry\Registry;
$options->set('api.url', 'https://docs.joomla.org');
$mediawiki = new JMediawiki($options);
diff --git a/cli/finder_indexer.php b/cli/finder_indexer.php
index 28dfba8212bdb..d7bb1c39e08d8 100644
--- a/cli/finder_indexer.php
+++ b/cli/finder_indexer.php
@@ -156,7 +156,7 @@ public function doExecute()
*/
private function index()
{
- require_once JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/indexer.php';
+ JLoader::register('FinderIndexer', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/indexer.php');
// Disable caching.
$config = JFactory::getConfig();
diff --git a/components/com_ajax/ajax.php b/components/com_ajax/ajax.php
index 6c469cf2f2686..1de04eb77cb9b 100644
--- a/components/com_ajax/ajax.php
+++ b/components/com_ajax/ajax.php
@@ -86,7 +86,7 @@
if (is_file($helperFile))
{
- require_once $helperFile;
+ JLoader::register($class, $helperFile);
if (method_exists($class, $method . 'Ajax'))
{
diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php
index aea8d854e4066..6aea1f3ac8d72 100644
--- a/components/com_banners/models/banners.php
+++ b/components/com_banners/models/banners.php
@@ -206,9 +206,7 @@ public function getItems()
foreach ($this->cache['items'] as &$item)
{
- $parameters = new Registry;
- $parameters->loadString($item->params);
- $item->params = $parameters;
+ $item->params = new Registry($item->params);
}
}
@@ -229,6 +227,11 @@ public function impress()
$db = $this->getDbo();
$query = $db->getQuery(true);
+ if (!count($items))
+ {
+ return;
+ }
+
foreach ($items as $item)
{
$bid[] = (int) $item->id;
diff --git a/components/com_contact/controllers/contact.php b/components/com_contact/controllers/contact.php
index 4b6e4b6f77da0..8993230bc55dd 100644
--- a/components/com_contact/controllers/contact.php
+++ b/components/com_contact/controllers/contact.php
@@ -59,7 +59,7 @@ public function submit()
// Check for a valid session cookie
if ($params->get('validate_session', 0))
{
- if (JFactory::getSession()->getState() != 'active')
+ if (JFactory::getSession()->getState() !== 'active')
{
JError::raiseWarning(403, JText::_('JLIB_ENVIRONMENT_SESSION_INVALID'));
diff --git a/components/com_contact/helpers/association.php b/components/com_contact/helpers/association.php
index 2f2be6c3956ae..a3b8ad9338a39 100644
--- a/components/com_contact/helpers/association.php
+++ b/components/com_contact/helpers/association.php
@@ -33,10 +33,10 @@ abstract class ContactHelperAssociation extends CategoryHelperAssociation
public static function getAssociations($id = 0, $view = null)
{
$jinput = JFactory::getApplication()->input;
- $view = is_null($view) ? $jinput->get('view') : $view;
+ $view = $view === null ? $jinput->get('view') : $view;
$id = empty($id) ? $jinput->getInt('id') : $id;
- if ($view == 'contact')
+ if ($view === 'contact')
{
if ($id)
{
@@ -53,7 +53,7 @@ public static function getAssociations($id = 0, $view = null)
}
}
- if ($view == 'category' || $view == 'categories')
+ if ($view === 'category' || $view === 'categories')
{
return self::getCategoryAssociations($id, 'com_contact');
}
diff --git a/components/com_contact/helpers/route.php b/components/com_contact/helpers/route.php
index 79a2004ee6543..c78ec6e5df4a4 100644
--- a/components/com_contact/helpers/route.php
+++ b/components/com_contact/helpers/route.php
@@ -40,7 +40,7 @@ public static function getContactRoute($id, $catid, $language = 0)
$link .= '&catid=' . $catid;
}
- if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+ if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
{
$link .= '&lang=' . $language;
}
@@ -78,7 +78,7 @@ public static function getCategoryRoute($catid, $language = 0)
// Create the link
$link = 'index.php?option=com_contact&view=category&id=' . $id;
- if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+ if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
{
$link .= '&lang=' . $language;
}
diff --git a/components/com_contact/models/category.php b/components/com_contact/models/category.php
index 044d42b783d74..590e956d47c3d 100644
--- a/components/com_contact/models/category.php
+++ b/components/com_contact/models/category.php
@@ -96,9 +96,7 @@ public function getItems()
$item = & $items[$i];
if (!isset($this->_params))
{
- $params = new Registry;
- $params->loadString($item->params);
- $item->params = $params;
+ $item->params = new Registry($item->params);
}
$this->tags = new JHelperTags;
$this->tags->getItemTags('com_contact.contact', $item->id);
@@ -159,7 +157,7 @@ protected function getListQuery()
// Join over the users for the author and modified_by names.
$query->select("CASE WHEN a.created_by_alias > ' ' THEN a.created_by_alias ELSE ua.name END AS author")
- ->select("ua.email AS author_email")
+ ->select('ua.email AS author_email')
->join('LEFT', '#__users AS ua ON ua.id = a.created_by')
->join('LEFT', '#__users AS uam ON uam.id = a.modified_by');
@@ -201,7 +199,7 @@ protected function getListQuery()
}
// Set sortname ordering if selected
- if ($this->getState('list.ordering') == 'sortname')
+ if ($this->getState('list.ordering') === 'sortname')
{
$query->order($db->escape('a.sortname1') . ' ' . $db->escape($this->getState('list.direction', 'ASC')))
->order($db->escape('a.sortname2') . ' ' . $db->escape($this->getState('list.direction', 'ASC')))
@@ -235,7 +233,7 @@ protected function populateState($ordering = null, $direction = null)
// List state information
$format = $app->input->getWord('format');
- if ($format == 'feed')
+ if ($format === 'feed')
{
$limit = $app->get('feed_limit');
}
diff --git a/components/com_contact/models/contact.php b/components/com_contact/models/contact.php
index 32f5e535183ed..24ae2308bfb0f 100644
--- a/components/com_contact/models/contact.php
+++ b/components/com_contact/models/contact.php
@@ -199,19 +199,17 @@ public function &getItem($pk = null)
}
// Check for published state if filter set.
- if (((is_numeric($published)) || (is_numeric($archived))) && (($data->published != $published) && ($data->published != $archived)))
+ if ((is_numeric($published) || is_numeric($archived)) && (($data->published != $published) && ($data->published != $archived)))
{
JError::raiseError(404, JText::_('COM_CONTACT_ERROR_CONTACT_NOT_FOUND'));
}
// Convert parameter fields to objects.
- $registry = new Registry;
- $registry->loadString($data->params);
+ $registry = new Registry($data->params);
$data->params = clone $this->getState('params');
$data->params->merge($registry);
- $registry = new Registry;
- $registry->loadString($data->metadata);
+ $registry = new Registry($data->metadata);
$data->metadata = $registry;
$data->tags = new JHelperTags;
@@ -273,8 +271,7 @@ protected function buildContactExtendedData($contact)
$groups = implode(',', $user->getAuthorisedViewLevels());
$published = $this->getState('filter.published');
- $contactParams = new Registry;
- $contactParams->loadString($contact->params);
+ $contactParams = new Registry($contact->params);
// If we are showing a contact list, then the contact parameters take priority
// So merge the contact parameters with the merged parameters
@@ -459,8 +456,7 @@ protected function getContactQuery($pk = null)
if ($result)
{
- $contactParams = new Registry;
- $contactParams->loadString($result->params);
+ $contactParams = new Registry($result->params);
// If we are showing a contact list, then the contact parameters take priority
// So merge the contact parameters with the merged parameters
diff --git a/components/com_contact/models/featured.php b/components/com_contact/models/featured.php
index d235d7b461ed7..2a981d31043b3 100644
--- a/components/com_contact/models/featured.php
+++ b/components/com_contact/models/featured.php
@@ -122,9 +122,7 @@ public function getItems()
$item = & $items[$i];
if (!isset($this->_params))
{
- $params = new Registry;
- $params->loadString($item->params);
- $item->params = $params;
+ $item->params = new Registry($item->params);
}
}
diff --git a/components/com_contact/router.php b/components/com_contact/router.php
index 81cf0356f3635..597569cd0a201 100644
--- a/components/com_contact/router.php
+++ b/components/com_contact/router.php
@@ -20,7 +20,7 @@ class ContactRouter extends JComponentRouterView
/**
* Search Component router constructor
- *
+ *
* @param JApplicationCms $app The application object
* @param JMenu $menu The menu object to work with
*/
@@ -52,14 +52,14 @@ public function __construct($app = null, $menu = null)
}
else
{
- require_once JPATH_SITE . '/components/com_contact/helpers/legacyrouter.php';
+ JLoader::register('ContactRouterRulesLegacy', __DIR__ . '/helpers/legacyrouter.php');
$this->attachRule(new ContactRouterRulesLegacy($this));
}
}
/**
* Method to get the segment(s) for a category
- *
+ *
* @param string $id ID of the category to retrieve the segments for
* @param array $query The request that is build right now
*
@@ -92,7 +92,7 @@ public function getCategorySegment($id, $query)
/**
* Method to get the segment(s) for a category
- *
+ *
* @param string $id ID of the category to retrieve the segments for
* @param array $query The request that is build right now
*
@@ -105,7 +105,7 @@ public function getCategoriesSegment($id, $query)
/**
* Method to get the segment(s) for a contact
- *
+ *
* @param string $id ID of the contact to retrieve the segments for
* @param array $query The request that is build right now
*
@@ -139,7 +139,7 @@ public function getContactSegment($id, $query)
/**
* Method to get the id for a category
- *
+ *
* @param string $segment Segment to retrieve the ID for
* @param array $query The request that is parsed right now
*
@@ -175,10 +175,10 @@ public function getCategoryId($segment, $query)
/**
* Method to get the segment(s) for a category
- *
+ *
* @param string $segment Segment to retrieve the ID for
* @param array $query The request that is parsed right now
- *
+ *
* @return mixed The id of this item or false
*/
public function getCategoriesId($segment, $query)
@@ -188,10 +188,10 @@ public function getCategoriesId($segment, $query)
/**
* Method to get the segment(s) for a contact
- *
+ *
* @param string $segment Segment of the contact to retrieve the ID for
* @param array $query The request that is parsed right now
- *
+ *
* @return mixed The id of this item or false
*/
public function getContactId($segment, $query)
diff --git a/components/com_contact/views/categories/tmpl/default_items.php b/components/com_contact/views/categories/tmpl/default_items.php
index 2d718bf1f5c83..041ea24a2f232 100644
--- a/components/com_contact/views/categories/tmpl/default_items.php
+++ b/components/com_contact/views/categories/tmpl/default_items.php
@@ -12,7 +12,7 @@
JHtml::_('bootstrap.tooltip');
$class = ' class="first"';
-if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
?>
items[$this->parent->id] as $id => $item) : ?>
numitems; ?>
- getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
+ maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
@@ -46,7 +46,7 @@
- getChildren()) > 0 && $this->maxLevelcat > 1) :?>
+ maxLevelcat > 1 && count($item->getChildren()) > 0) :?>
-params->get('presentation_style') == 'sliders') : ?>
+params->get('presentation_style') === 'sliders') : ?>
-params->get('presentation_style') == 'tabs') : ?>
+params->get('presentation_style') === 'tabs') : ?>
diff --git a/components/com_contact/views/contact/tmpl/default_profile.php b/components/com_contact/views/contact/tmpl/default_profile.php
index 1e699d1ad2dc1..03c59558edb05 100644
--- a/components/com_contact/views/contact/tmpl/default_profile.php
+++ b/components/com_contact/views/contact/tmpl/default_profile.php
@@ -19,17 +19,17 @@
$profile->text = htmlspecialchars($profile->value, ENT_COMPAT, 'UTF-8');
switch ($profile->id) :
- case "profile_website":
+ case 'profile_website':
$v_http = substr($profile->value, 0, 4);
- if ($v_http == "http") :
+ if ($v_http === 'http') :
echo '
items[$item->id] = $item->getChildren();
diff --git a/components/com_contact/views/category/tmpl/default_children.php b/components/com_contact/views/category/tmpl/default_children.php
index 11e0fed99afaf..b7bba546b9222 100644
--- a/components/com_contact/views/category/tmpl/default_children.php
+++ b/components/com_contact/views/category/tmpl/default_children.php
@@ -9,7 +9,7 @@
defined('_JEXEC') or die;
$class = ' class="first"';
-if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) :
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
?>
-
+
-
+
-
+
-
+
diff --git a/components/com_contact/views/contact/tmpl/default_form.php b/components/com_contact/views/contact/tmpl/default_form.php
index 31b0e2b282b99..ef21ae02405cd 100644
--- a/components/com_contact/views/contact/tmpl/default_form.php
+++ b/components/com_contact/views/contact/tmpl/default_form.php
@@ -22,7 +22,7 @@
form->getFieldset($fieldset->name); ?>
-
children[$this->category->id] as $id => $child) : ?>
diff --git a/components/com_contact/views/category/view.html.php b/components/com_contact/views/category/view.html.php
index 1dde9a62c0988..958219c4a1f2f 100644
--- a/components/com_contact/views/category/view.html.php
+++ b/components/com_contact/views/category/view.html.php
@@ -60,9 +60,8 @@ public function display($tpl = null)
foreach ($this->items as $item)
{
$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
- $temp = new Registry;
- $temp->loadString($item->params);
- $item->params = clone($this->params);
+ $temp = new Registry($item->params);
+ $item->params = clone $this->params;
$item->params->merge($temp);
if ($item->params->get('show_email_headings', 0) == 1)
@@ -100,7 +99,7 @@ protected function prepareDocument()
$path = array(array('title' => $this->category->title, 'link' => ''));
$category = $this->category->getParent();
- while (($menu->query['option'] != 'com_contact' || $menu->query['view'] == 'contact' || $id != $category->id) && $category->id > 1)
+ while (($menu->query['option'] !== 'com_contact' || $menu->query['view'] === 'contact' || $id != $category->id) && $category->id > 1)
{
$path[] = array('title' => $category->title, 'link' => ContactHelperRoute::getCategoryRoute($category->id));
$category = $category->getParent();
diff --git a/components/com_contact/views/contact/tmpl/default.php b/components/com_contact/views/contact/tmpl/default.php
index 3aeef20a65029..b1f55e3388bc8 100644
--- a/components/com_contact/views/contact/tmpl/default.php
+++ b/components/com_contact/views/contact/tmpl/default.php
@@ -34,11 +34,11 @@
get('show_contact_category'); ?>
-
+
contact->category_title; ?>
- + contact->catid); ?>@@ -62,17 +62,17 @@ item->event->beforeDisplayContent; ?> - + get('presentation_style'); ?> params->get('show_info', 1)) : ?> - + 'basic-details')); ?> - + 'basic-details')); ?> - + ' . JText::_('COM_CONTACT_DETAILS') . '
'; ?> @@ -98,27 +98,27 @@ - + - + get('show_email_form') && ($this->contact->email_to || $this->contact->user_id)) : ?> - + - + - + ' . JText::_('COM_CONTACT_EMAIL_FORM') . ''; ?> loadTemplate('form'); ?> - + - + @@ -128,47 +128,47 @@ get('show_articles') && $this->contact->user_id && $this->contact->articles) : ?> - + - + - + ' . JText::_('JGLOBAL_ARTICLES') . ''; ?> loadTemplate('articles'); ?> - + - + get('show_profile') && $this->contact->user_id && JPluginHelper::isEnabled('user', 'profile')) : ?> - + - + - + ' . JText::_('COM_CONTACT_PROFILE') . ''; ?> loadTemplate('profile'); ?> - + - + contact->misc && $tparams->get('show_misc')) : ?> - + - + - + ' . JText::_('COM_CONTACT_OTHER_INFORMATION') . ''; ?> @@ -187,16 +187,16 @@Napomena: ova operacija traje oko 10 sekundi za preuzimanje i instaliranje svakog jezika. Nemojte izabrati više od 3 jezika za istovremenu instalaciju, da zbog previše duge instalacije ne bi došlo do prekida programa." INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Ova operacija traje oko 10 sekundi po jeziku
Molim saÄekajte da Joomla preuzme i instalira jezik..." INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nijedan jezik nije odabran za instaliranje. Ako želite da instalirate viÅ¡e jezika kliknite na dugme 'Prethodno' i odaberite željeni jezik iz liste" -INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ne može da se prijavi na server sa jezicima. ZavrÅ¡ite instalacioni proces." +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla ne može da se prijavi na server sa jezicima. ZavrÅ¡ite instalacioni proces." INSTL_LANGUAGES_WARNING_NO_INTERNET2="Napomena: Jezik možete instalirati iz Joomla! administracije" INSTL_LANGUAGES_WARNING_BACK_BUTTON="Povratak na zadnji instalacioni korak" @@ -158,6 +160,7 @@ INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Odaberi" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Jezik" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Oznaka" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla nije u mogućnosti da automatski kreira sadržaj za jezik %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ADD_ASSOCIATIONS="Joomla ne može automatski da kreira jeziÄku asocijaciju." INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla ne može automatski da kreira izbornik %s" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla ne može automatski da kreira poÄetnu stavku izbornika %s" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla ne može automatski da kreira izbornik modul %s" @@ -274,7 +277,7 @@ JCHECK_AGAIN="Provjeri ponovo" JERROR="GreÅ¡ka" JEMAIL="E-poÅ¡ta" JGLOBAL_ISFREESOFTWARE="%s je slobodan softver pod %s." -JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="JeziÄki paket ne odgovara ovoj Joomla! verziji. Nedostaju neki izrazi." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="JeziÄni paket ne odgovara ovoj verziji Joomle. Neki prijevodi bi mogli nedostajati i biti će prikazani na engleskom." JGLOBAL_SELECT_AN_OPTION="Odaberite opciju" JGLOBAL_SELECT_NO_RESULTS_MATCH="Nema odgovarajućih rezultata" JGLOBAL_SELECT_SOME_OPTIONS="Odaberite neku opciju" @@ -323,3 +326,16 @@ POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" + +; Javascript message titles +ERROR="GreÅ¡ka" +MESSAGE="Poruka" +NOTICE="Napomena" +WARNING="Upozorenje" + +; Javascript ajax error messages +JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="DoÅ¡lo je do prekida veze prilikom dohvaćanja JSON podataka." +JLIB_JS_AJAX_ERROR_NO_CONTENT="Nema vraćenog sadržaja." +JLIB_JS_AJAX_ERROR_OTHER="GreÅ¡ka kod dohvaćanja JSON podataka: HTTP %s status kôd." +JLIB_JS_AJAX_ERROR_PARSE="GreÅ¡ka prilikom procesiranja JSON podataka:
%s"
+JLIB_JS_AJAX_ERROR_TIMEOUT="Isteklo je vrijeme za dohvaćanje JSON podataka."
diff --git a/installation/language/bs-BA/bs-BA.xml b/installation/language/bs-BA/bs-BA.xml
index 71228f57411ef..26193a5a1e5cf 100644
--- a/installation/language/bs-BA/bs-BA.xml
+++ b/installation/language/bs-BA/bs-BA.xml
@@ -3,8 +3,8 @@
version="3.6"
client="installation">
བརྗེད་à½à½¼à¼: འ་ནི་གློག་རིག་ལས་སྤྱོད་ཀྱི་ སà¾à½‘་ཡིག་གནས་སྡུད་སྤོ་ནི་དང་བཙུགས་ནི་དོན་ལུ་ སà¾à½¢à¼‹à½†à¼‹ ༡༠དེ་ཅིག་འགོར་འོང་༠འདི་ དུས་ཚད་མ་ལང་པའི་དཀའ་ངལ་ལས་འཛེམ་ནི་དོན་ལུ་ སà¾à½‘་ཡིག་བཙུགས་ནི་ ༣ ལས་མངམ་ གདམ་à½à¼‹à½˜à¼‹à½¢à¾à¾±à½–༠" INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="འ་ནི་གློག་རིག་ལས་སྤྱོད་ཀྱི་ སà¾à½‘་ཡིག་ཅིག་བཟོ་ནིའི་དོན་ལུ་ སà¾à½¢à¼‹à½†à¼‹ ༡༠ཚུན་ཚད་འགོར་འོང་à¼
སà¾à½‘་ཡིག་ཚུ་ གནས་སྡུད་སྤོ་བའི་སà¾à½–ས་དང་ བཙུགས་བཞག་འབད་བའི་སà¾à½–ས་ལུ་ སྒུག་གནངà¼" @@ -180,7 +182,7 @@ INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="འ་ནི་ཚ་ཚན་འད INSTL_DEFAULTLANGUAGE_TRY_LATER="ཤུལ་ལས་ à½à¾±à½¼à½‘་ར་ཇུམ་ལ་(Joomla)གི་བདག་སà¾à¾±à½¼à½„་པ་ལག་ལེན་འà½à½–་à½à½ºà¼‹ བཙུགས་བཞག་འབད་ཚུགསà¼" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español -INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="རྫོང་à½à¼‹ (BT)" +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="དབྱིན་སà¾à½‘à¼(BT)" ;Database Model INSTL_DATABASE_COULD_NOT_CONNECT="གནས་སྡུད་གཞི་མཛོད་ལུ་ མà½à½´à½‘་མ་ཚུགས༠འབྲེལ་མà½à½´à½‘་ལོག་མི་གྱངས་à½à¼‹ : %s" @@ -192,6 +194,7 @@ INSTL_DATABASE_ERROR_CREATE="གནས་སྡུད་གཞི་མཛོད INSTL_DATABASE_ERROR_DELETE="འཛོལ་བ་ལ་ལུ་ གནས་སྡུད་གཞི་མཛོད་བà½à½¼à½“་གà½à½„་བའི་སà¾à½–ས་འབྱུང་ནུག" INSTL_DATABASE_FIELD_VALUE_REMOVE="བà½à½¼à½“་གà½à½„à¼" INSTL_DATABASE_FIELD_VALUE_BACKUP="རྒྱབ་སྣོནà¼" +INSTL_DATABASE_FIX_LOWERCASE="གནས་སྡུད་གཞི་མཛོད་ PostgreSQL གི་དོན་ལུ་ à½à½¼à½ ི་སྔོན་ཚིག་འདི་ ཡིག་ཆུང་འོང་དགོà¼" INSTL_DATABASE_FIX_TOO_LONG="མའི་ཨེས་ཀིà½à¼‹à½¨à½ºà½£à¼‹(MySQL) རྫས་à½à½¼à½ ི་སྔོན་ཚིག་འདི་ à½à¾±à½‘་ཆོས་མà½à½¼à¼‹à½¤à½¼à½¦à¼‹ ༡༥ དགོà¼" INSTL_DATABASE_INVALID_DB_DETAILS="གནས་སྡུད་གཞི་མཛོད་ཀྱི་à½à¼‹à½‚སལ་བཀལ་ཡོད་མི་འདི་ འཛོལ་བ་ ཡང་ན་ སྟོངམ་འདུག" INSTL_DATABASE_INVALID_MYSQL_VERSION="à½à¾±à½¼à½‘་ར་ བཙུགས་བཞག་འཕྲོ་མà½à½´à½‘་འབད་ནིའི་དོན་ལུ་ མའི་ཨེས་ཀིà½à¼‹à½¨à½ºà½£à¼‹(MySQL) ༥.༠.༤ ཡང་ན་ འདི་ལས་མà½à½¼à¼‹à½¤à½¼à½¦à¼‹à½‘གོ༠à½à¾±à½¼à½‘་ཀྱི་ à½à½¼à½“་རིམ་འདི་ %s" @@ -248,8 +251,10 @@ INSTL_MAGIC_QUOTES_GPC="སྒྱུ་མའི་དཔེ་བཀོད་ G INSTL_MAGIC_QUOTES_RUNTIME="སྒྱུ་མའི་དཔེ་བཀོད་རྒྱུ་ལམ་གྱི་དུསà¼" INSTL_MB_LANGUAGE_IS_DEFAULT="སà¾à½‘་ཡིག་ MB འདི་སྔོན་སྒྲིག་ཨིནà¼" INSTL_MB_STRING_OVERLOAD_OFF="རྗོད་ཚིག་ MB གི་མང་དྲགས་འདི་ ངོས་ལེན་མེདཔà¼" +INSTL_MCRYPT_SUPPORT_AVAILABLE="Mcrypt གི་རྒྱབ་རྟེནà¼" INSTL_NOTICEMBLANGNOTDEFAULT="སà¾à½‘་ཡིག་ PHP mbstring འདི་བར་གནས་ལུ་མ་བཟོ་ནུག༠འ་ནི་འདི་
.htaccess གི་ཡིག་སྣོད་ནང་ལུ་ ས་གནས་ལས་ php_value mbstring.language བར་གནས་ འདི་བཙུགས་ཚུགསà¼"
INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring ལས་རིམ་ལུ་ མང་དྲགས་འདི་བཟོ་ནུག༠འ་ནི་འདི་ .htaccess གི་ཡིག་སྣོད་ནང་ལུ་ ས་གནས་ལས་ php_value mbstring.language བར་གནས་ འདི་ངོས་ལེན་མེདཔ་བཟོ་ཚུགསà¼"
+INSTL_NOTICEMCRYPTNOTAVAILABLE="ཉེན་བརྡ༠PHP mcrypt གི་ ཡིག་སྣོད་བརྡ་ཡིག་འདི་བཙུགས་བཞག་འབད་དགོ་ ཡང་ན་ འབད་བà½à½´à½–་བཟོ་དགོ༠དེ་ཚུ་མེད་པ་ཅིན་ ཇུམ་ལ་(Joomla)གི་à½à¾±à½‘་གནད་ལ་ལུ་གཅི་ ལག་ལེན་འà½à½–་ནི་དོན་ལུ་à½à½¼à½–་མི་ཚུགསà¼"
INSTL_NOTICEYOUCANSTILLINSTALL="རིམ་སྒྲིག་བཟོ་བཀོད་འདི་མཇུག་ལུ་གསལ་སྟོན་འབད་ནི་ཨིནམ་ལས་ à½à¾±à½¼à½‘་ར་ བཙུགས་བཞག་འདི་ད་ལྟོ་ཡང༌འཕྲོ་མà½à½´à½‘་འབད་ཚུགས༠à½à¾±à½¼à½‘་ར་ གསང་ཚིག་འདི་ལགཔ་གི་འབད་ བཙུགས་དགོ༠ཚིག་ཡིག་ས་à½à½¼à½„ས་ནང་ལས་ གསང་ཡིག་འདི་གདམ་à½à¼‹à½¢à¾à¾±à½–་à½à½ºà¼‹ གཙོ་རྟགས་བཀལ་ དེ་ལས་ ཡིག་སྣོད་གསརཔ་ནང་ལུ་བཙུགས༠ཡིག་སྣོད་ཀྱི་མིང་ 'configuration.php' བཟོ་སྟེ་ ས་à½à½¼à½„ས་རྩ་ལག་གི་ཡིག་སྣོད་ནང་ལུ་བཙུགསà¼" INSTL_OUTPUT_BUFFERING="གྲུབ་འབྲསའི་བར་ཤུགས་བཟེད་མིà¼" INSTL_PARSE_INI_FILE_AVAILABLE="INI པར་སར་(Parser) རྒྱབ་རྟེནà¼" diff --git a/installation/language/dz-BT/dz-BT.xml b/installation/language/dz-BT/dz-BT.xml index 6893659557143..694e13cdfc959 100644 --- a/installation/language/dz-BT/dz-BT.xml +++ b/installation/language/dz-BT/dz-BT.xml @@ -3,8 +3,8 @@ version="3.6" client="installation">
" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="ΑφαίÏεση φακÎλου installation" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_INSTALLATION="ΠΑΡΑΚΑΛΩ ΘΥΜΗΘΕΙΤΕ ÎΑ ΔΙΑΓΡΑΨΕΤΕ ΤΟΠΦΑΚΕΛΟ INSTALLATION.
Δε θα μποÏÎσετε να Ï€ÏοχωÏήσετε Ï€ÎÏα απο αυτό το σημείο της εγκατάστασης μÎχÏι να απομακÏÏνετε εντελώς το φάκελο installation. Î Ïόκειται για μια δικλείδα σσφαλείας του Joomla!." INSTL_COMPLETE_TITLE="ΣυγχαÏητήÏια! Εγκαταστήσατε το Joomla!." INSTL_COMPLETE_INSTALL_LANGUAGES="ΕπιπλÎον βήματα: Εγκατάσταση γλωσσών" @@ -130,6 +138,7 @@ INSTL_COMPLETE_INSTALL_LANGUAGES="ΕπιπλÎον βήματα: Εγκατάσ ;Languages view INSTL_LANGUAGES="Εγκατάσταση πακÎτων γλωσσών" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Γλώσσα" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="ΕτικÎτα Γλώσσας" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Έκδοση" INSTL_LANGUAGES_DESC="Αυτή η διεπαφή του Joomla Îιναι διαθÎσιμη σε πολλÎÏ‚ γλώσσες. ΔιαλÎξτε τις γλώσσες που Ï€Ïοτιμάτε κάνοντας κλίκ στα αντίστοιχα κουτάκια και εγκαταστήστε τις πατώντας το κουμπί Επόμενο.
ΣημÎιωση: Αυτή η διεÏγασία διαÏκεί πεÏίπου 5 δευτεÏόλεπτα για λήψη και εγκατάσταση κάθε γλώσσας. ΠαÏακαλώ μην επιλεξετε πεÏισσότεÏες απο 3 γλώσσες για εγκατάσταση για να αποφÏγετε timeouts." INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Αυτή η διεÏγασία θα διαÏκÎσει πεÏίπου 10 δευτεÏόλεπτα για κάθε γλώσσα για να ολοκληÏωθεί.
ΠαÏακαλώ πεÏιμÎνετε ενώ γίνεται λήψη και εγκατάσταση των γλωσσών..." @@ -150,6 +159,7 @@ INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Το Joomla ÏŒÏισε τα %s σαν INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Επιλογή" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Γλώσσα" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="ΕτικÎτα" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ADD_ASSOCIATIONS="Το Joomla δεν μπόÏεσε να δημιουÏγήσει αυτόματα τις συσχÎτισεις γλωσσών." INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Το Joomla δεν μπόÏεσε να δημιουÏγήσει αυτόματα την γλώσσα πεÏιεχομÎνου %s" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Το Joomla δεν μπόÏεσε να δημιουÏγήσει αυτόματα το Î¼ÎµÎ½Î¿Ï %s" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Το Joomla δεν μπόÏεσε να δημιουÏγήσει αυτόματα το αντικείμενο αÏχικής σελίδας %s" @@ -186,6 +196,7 @@ INSTL_DATABASE_ERROR_CREATE="Î ÏοÎκυψε Îνα σφάλμα κατά τη INSTL_DATABASE_ERROR_DELETE="Î ÏοÎκυψαν σφάλματα κατα την διαγÏαφή της βάσης δεδομÎνων." INSTL_DATABASE_FIELD_VALUE_REMOVE="ΑφαίÏεση" INSTL_DATABASE_FIELD_VALUE_BACKUP="ΑντίγÏαφο ασφαλείας" +INSTL_DATABASE_FIX_LOWERCASE="Το Ï€Ïόθεμα πινάκων βάσης δεδομÎνων Ï€ÏÎπει να είναι με πεχά για την PostgreSQL." INSTL_DATABASE_FIX_TOO_LONG="Το Ï€Ïοθεμα του πίνακα MySQL Ï€ÏÎπει να είναι εως 15 χαÏακτήÏες." INSTL_DATABASE_INVALID_DB_DETAILS="Οι πληÏοφοÏίες σχετικά με την βάση δεδομÎνων είναι λανθασμενες και/ή κενÎÏ‚." INSTL_DATABASE_INVALID_MYSQL_VERSION="Απαιτείται Îκδοση MySQL 5.0.4 ή μεγαλÏτεÏη για να συνεχίσετε την εγκατάσταση. Η Îκδοσή σας είναι: %s" @@ -242,8 +253,10 @@ INSTL_MAGIC_QUOTES_GPC="Μαγικά Εισαγωγικά GPC απενεÏγοπ INSTL_MAGIC_QUOTES_RUNTIME="Μαγικά Εισαγωγικά ΧÏόνου ΕκτÎλεσης" INSTL_MB_LANGUAGE_IS_DEFAULT="Η γλώσσα MB είναι Ï€Ïοεπιλογή" INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload απενεÏγοποιημÎνο" +INSTL_MCRYPT_SUPPORT_AVAILABLE="ΥποστήÏιξη Mcrypt" INSTL_NOTICEMBLANGNOTDEFAULT="Η γλώσσα PHP mbstring δεν οÏίστηκε σαν ουδÎτεÏη. Αυτό μποÏεί να οÏιστεί τοπικά γÏάφοντας php_value mbstring.language neutral στο αÏχείο
.htaccess ."
INSTL_NOTICEMBSTRINGOVERLOAD="Η λειτουÏγία υπεÏφόÏτωσης για την PHP mbstring Îχει οÏιστεί. Αυτή μποÏεί να απενεÏγοποιηθεί γÏάφοντας php_value mbstring.func_overload 0 στο αÏχείο .htaccess ."
+INSTL_NOTICEMCRYPTNOTAVAILABLE="Î Ïοσοχή! Η επÎκταση mcrypt της PHP Ï€ÏÎπει να είναι εγκατεστημÎνη και ενεÏγή. ΧωÏίς αυτή οÏισμÎνα χαÏακτηÏιστικά του Joomla δεν θα είναι διαθÎσιμα."
INSTL_NOTICEYOUCANSTILLINSTALL="ΜποÏείτε να συνεχίσετε την εγκατάσταση καθώς οι Ïυθμίσεις θα εμφανίζονται στο Ï„Îλος. Θα Ï€ÏÎπει να μεταφοÏτώσετε τον κώδικα με το χÎÏι. ΚλικάÏετε στην πεÏιοχή κειμÎνου για να επιλÎξετε όλο τον κώδικα και επικολλήστε τον σε Îνα νÎο αÏχείο κειμÎνου. Ονομάστε αυτό το αÏχείο 'configuration.php' και μεταφοÏτώστε το στον κεντÏικό φάκελο της ιστοσελίδας σας." INSTL_OUTPUT_BUFFERING="Ρυθμιστής Εξόδου" INSTL_PARSE_INI_FILE_AVAILABLE="ΥποστήÏιξη INI Parser " @@ -313,3 +326,17 @@ POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" + +; Javascript message titles +ERROR="Σφάλμα" +MESSAGE="Μήνυμα" +NOTICE="Ειδοποίηση" +WARNING="Î Ïοειδοποίηση" + +; Javascript ajax error messages +JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Η σÏνδεση ανεστάλει κατά την ανάκτηση δεδομÎνων JSON." +JLIB_JS_AJAX_ERROR_NO_CONTENT="Δεν επεστÏάφει πεÏιεχόμενο." +JLIB_JS_AJAX_ERROR_OTHER="Σφάλμα κατά την ανάκτηση δεδομÎνων JSON: Κωδικός κατάστασης HTTP %s." +JLIB_JS_AJAX_ERROR_PARSE="Σφάλμα ανάλυσης κατά την επεξεÏγασία των παÏακάτω δεδομÎνων JSON:
%s"
+JLIB_JS_AJAX_ERROR_TIMEOUT="Σφάλμα λήξης χÏόνου σÏνδεσης κατά την ανάκτηση δεδομÎνων JSON."
+
diff --git a/installation/language/el-GR/el-GR.xml b/installation/language/el-GR/el-GR.xml
index 8de147765397e..eafd48c7d6bdd 100644
--- a/installation/language/el-GR/el-GR.xml
+++ b/installation/language/el-GR/el-GR.xml
@@ -3,11 +3,11 @@
version="3.6"
client="installation">
You can't install Joomla! until your setup meets the requirements below." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Recommended settings:" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla.
However, Joomla! will still operate if your settings do not quite match the recommended configuration." +INSTL_PRECHECK_DIRECTIVE="Directive" +INSTL_PRECHECK_RECOMMENDED="Recommended" +INSTL_PRECHECK_ACTUAL="Actual" + +; Database view +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_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." +INSTL_DATABASE_OLD_PROCESS_DESC=""Backup" or "Remove" any existing tables from former Joomla! installations with the same "Table Prefix"." +INSTL_DATABASE_OLD_PROCESS_LABEL="Old Database Process" +INSTL_DATABASE_PASSWORD_DESC="For site security using a password for the database account is mandatory." +INSTL_DATABASE_PASSWORD_LABEL="Password" +INSTL_DATABASE_PREFIX_DESC="Create a table prefix or use the randomly generated one. Ideally four or five characters long, it may only contain alphanumeric characters and MUST end in an underscore. Make sure that the prefix chosen is not already used by other tables." +INSTL_DATABASE_PREFIX_LABEL="Table Prefix" +INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, be followed by optional alphanumeric characters and by an underscore" +INSTL_DATABASE_TYPE_DESC="This is probably "MySQLi"." +INSTL_DATABASE_TYPE_LABEL="Database Type" +INSTL_DATABASE_USER_DESC="Either a username you created or a username provided by your host." +INSTL_DATABASE_USER_LABEL="Username" + + +;FTP view +INSTL_AUTOFIND_FTP_PATH="Autofind FTP Path" +INSTL_FTP="FTP Configuration" +INSTL_FTP_DESC="
On some servers you may need to provide FTP credentials for installation to complete. If you have difficulties completing installation without these credentials, check with your host to determine if this is necessary.
For security reasons, it is best to create a separate FTP user account with access to the Joomla! installation only and not the entire web server. Your host can assist you with this.
Note: If you are installing on a Windows Operating System, the FTP layer is not required.
" +INSTL_FTP_ENABLE_LABEL="Enable FTP Layer" +INSTL_FTP_HOST_LABEL="FTP Host" +INSTL_FTP_PASSWORD_LABEL="FTP Password" +INSTL_FTP_PORT_LABEL="FTP Port" +INSTL_FTP_ROOT_LABEL="FTP Root Path" +INSTL_FTP_SAVE_LABEL="Save FTP Password" +INSTL_FTP_TITLE="FTP Configuration (Optional - Most Users Can Skip This Step - Press Next to Skip)" +INSTL_FTP_USER_LABEL="FTP Username" +INSTL_VERIFY_FTP_SETTINGS="Verify FTP Settings" +INSTL_FTP_SETTINGS_CORRECT="Settings correct" +INSTL_FTP_USER_DESC="Warning! It is recommended to leave this blank and enter your FTP username each time you transfer files." +INSTL_FTP_PASSWORD_DESC="Warning! It is recommended to leave this blank and enter your FTP password each time you transfer files." + +;Site View +INSTL_SITE="Main Configuration" +INSTL_ADMIN_EMAIL_LABEL="Administrator Email" +INSTL_ADMIN_EMAIL_DESC="Enter an email address. This will be the email address of the website Super User." +INSTL_ADMIN_PASSWORD_LABEL="Administrator Password" +INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super User account and confirm it in the field below." +INSTL_ADMIN_PASSWORD2_LABEL="Confirm Administrator Password" +INSTL_ADMIN_USER_LABEL="Administrator Username" +INSTL_ADMIN_USER_DESC="Set the username for your Super User account." +INSTL_SITE_NAME_LABEL="Site Name" +INSTL_SITE_NAME_DESC="Enter the name of your Joomla! site." +INSTL_SITE_METADESC_LABEL="Description" +INSTL_SITE_METADESC_TITLE_LABEL="Enter a description of the overall website that is to be used by search engines. Generally, a maximum of 20 words is optimal." +INSTL_SITE_OFFLINE_LABEL="Site Offline" +INSTL_SITE_OFFLINE_TITLE_LABEL="Set the site Frontend offline when installation is completed. The site can be set online later on through the Global Configuration." +INSTL_SITE_INSTALL_SAMPLE_LABEL="Install Sample Data" +INSTL_SITE_INSTALL_SAMPLE_DESC="Installing sample data is strongly recommended for beginners.This will install sample content that is included in the Joomla! installation package." +INSTL_SITE_INSTALL_SAMPLE_NONE="None (Required for basic native multilingual site creation)" +INSTL_SAMPLE_BLOG_SET="Blog English (GB) Sample Data" +INSTL_SAMPLE_BROCHURE_SET="Brochure English (GB) Sample Data" +INSTL_SAMPLE_DATA_SET="Default English (GB) Sample Data" +INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Sample Data" +INSTL_SAMPLE_TESTING_SET="Test English (GB) Sample Data" +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content." +INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts." +INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom, Login Form." +INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form." +INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe how Joomla works." +INSTL_SAMPLE_TESTING_SET_DESC="Install Joomla with all possible menu items to help with testing Joomla." + +;Summary view +INSTL_FINALISATION="Finalisation" +INSTL_SUMMARY_INSTALL="Install" +INSTL_SUMMARY_EMAIL_LABEL="Email Configuration" +INSTL_SUMMARY_EMAIL_DESC="Send configuration settings to %s by email after installation." +INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Include Passwords in Email" +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Warning! It is recommended to not send and store your passwords in emails." + +;Installing view +INSTL_INSTALLING="Installing ..." +INSTL_INSTALLING_DATABASE_BACKUP="Backing up old database tables" +INSTL_INSTALLING_DATABASE_REMOVE="Removing old database tables" +INSTL_INSTALLING_DATABASE="Creating database tables" +INSTL_INSTALLING_SAMPLE="Installing sample data" +INSTL_INSTALLING_CONFIG="Creating configuration File" +INSTL_INSTALLING_EMAIL="Sending email to %s" + +;Email +INSTL_EMAIL_SUBJECT="Configuration Details: %s" +INSTL_EMAIL_HEADING="Below you can find the configuration settings for a newly setup Joomla! website:" +INSTL_EMAIL_NOT_SENT="Email could not be sent." + +;Complete view +INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administration Login Details" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="The installation folder has already been deleted." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation folder could not be deleted. Please manually delete the folder." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_FOLDER_REMOVED="Installation folder successfully removed." +INSTL_COMPLETE_LANGUAGE_1="Joomla! in your own language and/or automatic basic native multilingual site creation" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_LANGUAGE_DESC="Before removing the installation folder you can install extra languages. If you want to add extra languages to your Joomla! application select the following button." +INSTL_COMPLETE_LANGUAGE_DESC2="Note: you will need internet access for Joomla! to download and install the new languages.
Some server configurations won't allow Joomla! to install the languages. If this is your case, don't worry, you will be able to install them later using the Joomla! Administrator." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_FOLDER="Remove installation folder" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_INSTALLATION="PLEASE REMEMBER TO COMPLETELY REMOVE THE INSTALLATION FOLDER.
You will not be able to proceed beyond this point until the installation folder has been removed. This is a security feature of Joomla!" +INSTL_COMPLETE_TITLE="Congratulations! Joomla! is now installed." +INSTL_COMPLETE_INSTALL_LANGUAGES="Extra steps: Install languages" + +;Languages view +INSTL_LANGUAGES="Install Language packages" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Language" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Language Tag" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version" +INSTL_LANGUAGES_DESC="The Joomla interface is available in several languages. Choose your preferred languages by choosing the checkboxes and then install them by selecting the Next button.
Note: this operation will take about 10 seconds to download and install every language. To avoid timeouts please select no more than 3 languages to install." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="This operation will take up to 10 seconds per language to complete
Please wait while we download and install the languages ..." +INSTL_LANGUAGES_MORE_LANGUAGES="Press the 'Previous' button if you want to install more languages." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No languages have been selected to be installed. If you need to install more languages, press the 'Previous' button and choose the desired languages from the list." +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla was unable to connect to the languages server. Please finish the installation process." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla! Administrator" +INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step" + +;Default language view +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activate the multilingual feature" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="If active, your Joomla site will have the multilingual feature active with localised menus for each installed language." +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Enable the language code plugin" +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="If enabled, the language code plugin will add the ability to change the language code in the generated HTML document to improve SEO." +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Default Administrator language" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla was unable to set the language as default. English will be used as default language for the Backend Administrator." +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla has set %s as your default ADMINISTRATOR language." +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Select" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Language" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Tag" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ADD_ASSOCIATIONS="Joomla was unable to automatically create the language associations." +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla was unable to automatically create the %s content language." +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla was unable to automatically create the %s menu." +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla was unable to automatically create the %s home menu item." +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla was unable to automatically create the %s menu module." +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla was unable to automatically create the %s content category." +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla was unable to automatically create the %s localised article." +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla was unable to automatically publish the language switcher module." +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla was unable to automatically enable the Language Code Plugin." +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla was unable to automatically enable the Language Filter Plugin." +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla was unable to install %s language." +INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla was unable to automatically publish the language status module." +INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla was unable to automatically unpublish the default menu module." +INSTL_DEFAULTLANGUAGE_DESC="Joomla has installed the following languages. Please select your desired default language for the Joomla Administrator." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla has installed the following languages. Please select your desired default language for the Joomla Frontend." +INSTL_DEFAULTLANGUAGE_FRONTEND="Default Site language" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla was unable to set the language as default. English will be used as default language for the Frontend SITE." +INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla has set %s as your default SITE language." +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Install localised content" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="If active, Joomla will automatically create one content category per each installed language. Also, one featured article containing dummy content will be created on each category." +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingual" +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="This section allows you to automatically activate the Joomla! multilingual feature." +INSTL_DEFAULTLANGUAGE_TRY_LATER="You will be able to install it later using the Joomla! Administrator" + +; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="English (NZ)" + +;Database Model +INSTL_DATABASE_COULD_NOT_CONNECT="Could not connect to the database. Connector returned number: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="The installer could not connect to the specified database and was unable to create the database. Please verify your settings and if necessary manually create your database." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Could not refresh manifest cache for extension: %s" +INSTL_DATABASE_EMPTY_NAME="" +INSTL_DATABASE_ERROR_BACKINGUP="Some errors occurred in backing up the database." +INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.
The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla!" +INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database." +INSTL_DATABASE_FIELD_VALUE_REMOVE="Remove" +INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup" +INSTL_DATABASE_FIX_LOWERCASE="The table prefix must be lowercase for PostgreSQL." +INSTL_DATABASE_FIX_TOO_LONG="The MySQL table prefix must be a maximum of 15 characters." +INSTL_DATABASE_INVALID_DB_DETAILS="The database details provided are incorrect and/or empty." +INSTL_DATABASE_INVALID_MYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="You need PostgreSQL 8.3.18 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_TYPE="Please select the database type" +INSTL_DATABASE_NAME_TOO_LONG="The MySQL database name must be a maximum of 64 characters." +INSTL_DATABASE_INVALID_NAME="MySQL versions previous to 5.1.6 may not contain periods or other "special" characters in the name. Your version is: %s" +INSTL_DATABASE_NAME_INVALID_SPACES="MySQL database names and table names may not begin or end with spaces." +INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NULL ASCII(0x00)." +INSTL_DATABASE_FILE_DOES_NOT_EXIST="File %s does not exist" + +;controllers +INSTL_COOKIES_NOT_ENABLED="Cookies do not appear to be enabled on your browser client. You will not be able to install the application with this feature disabled. Alternatively, there could also be a problem with the server's session.save_path. If this is the case, please consult your hosting provider if you don't know how to check or fix this yourself." +INSTL_HEADER_ERROR="Error" + +;Helpers +INSTL_PAGE_TITLE="Joomla! Web Installer" + +;Configuration model +INSTL_ERROR_CONNECT_DB="Could not connect to the database. Connector returned number: %s" +INSTL_STD_OFFLINE_MSG="This site is down for maintenance.
Please check back again soon." + +;FTP model +INSTL_FTP_INVALIDROOT="The specified FTP Folder is not the folder of this Joomla! installation" +INSTL_FTP_NOCONNECT="Could not connect to the FTP server" +INSTL_FTP_NODELE="The function "DELE" failed." +INSTL_FTP_NODIRECTORYLISTING="Could not retrieve a folder listing from the FTP server." +INSTL_FTP_NOLIST="The function "LIST" failed." +INSTL_FTP_NOLOGIN="Could not log in to the FTP server." +INSTL_FTP_NOMKD="The function "MKD" failed." +INSTL_FTP_NONLST="The function "NLST" failed." +INSTL_FTP_NOPWD="The function "PWD" failed." +INSTL_FTP_NORETR="The function "RETR" failed." +INSTL_FTP_NORMD="The function "RMD" failed." +INSTL_FTP_NOROOT="Could not access the specified FTP folder." +INSTL_FTP_NOSTOR="The function "STOR" failed." +INSTL_FTP_NOSYST="The function "SYST" failed." +INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Unable to auto-detect the FTP root folder." + +;others +INSTL_CONFPROBLEM="Your configuration file or folder is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." +INSTL_DATABASE_SUPPORT="Database Support:" +INSTL_DISPLAY_ERRORS="Display Errors" +INSTL_ERROR_DB="Some errors occurred while populating the database: %s" +INSTL_ERROR_INITIALISE_SCHEMA="Can't initialise database schema" +INSTL_FILE_UPLOADS="File Uploads" +INSTL_GNU_GPL_LICENSE="GNU General Public License" +INSTL_JSON_SUPPORT_AVAILABLE="JSON Support" +INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off" +INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime" +INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default" +INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off" +INSTL_MCRYPT_SUPPORT_AVAILABLE="Mcrypt Support" +INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering php_value mbstring.language neutral in your
.htaccess file."
+INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload is set. This can be turned off locally by entering php_value mbstring.func_overload 0 in your .htaccess file."
+INSTL_NOTICEMCRYPTNOTAVAILABLE="Warning! PHP mcrypt extension should be installed or enabled. Without this, some features of Joomla will not be available."
+INSTL_NOTICEYOUCANSTILLINSTALL="You can still continue the installation as the configuration settings will be displayed at the end. You will have to manually upload the code. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." +INSTL_OUTPUT_BUFFERING="Output Buffering" +INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support" +INSTL_PHP_VERSION="PHP Version" +INSTL_PHP_VERSION_NEWER="PHP Version >= %s" +INSTL_REGISTER_GLOBALS="Register Globals Off" +INSTL_SAFE_MODE="Safe Mode" +INSTL_SESSION_AUTO_START="Session Auto Start" +INSTL_WRITABLE="%s Writeable" +INSTL_XML_SUPPORT="XML Support" +INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP support" +INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib Compression Support" +INSTL_PROCESS_BUSY="Process is in progress. Please wait ..." + +;Global strings +JADMINISTRATOR="Administrator" +JCHECK_AGAIN="Check Again" +JERROR="Error" +JEMAIL="Email" +JGLOBAL_ISFREESOFTWARE="%s is free software released under the %s." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Language pack does not match this Joomla! version. Some strings may be missing and will be displayed in English." +JGLOBAL_SELECT_AN_OPTION="Select an option" +JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match" +JGLOBAL_SELECT_SOME_OPTIONS="Select some options" +JINVALID_TOKEN="The most recent request was denied because it contained an invalid security token. Please refresh the page and try again." +JNEXT="Next" +JNO="No" +JNOTICE="Notice" +JOFF="Off" +JON="On" +JPREVIOUS="Previous" +JSITE="Site" +JUSERNAME="Username" +JYES="Yes" + +; Framework strings necessary when no lang pack is available +JLIB_DATABASE_ERROR_CONNECT_MYSQL="Could not connect to MySQL." +JLIB_DATABASE_ERROR_DATABASE="A Database error occurred." +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s" +JLIB_ENVIRONMENT_SESSION_EXPIRED="Your session has expired, please reload the page." +JLIB_FILESYSTEM_ERROR_COPY_FAILED="Copy failed" +JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Path is not a folder. Path: %s" +JLIB_FORM_FIELD_INVALID="Invalid field: " +JLIB_FORM_VALIDATE_FIELD_INVALID="Invalid field: %s" +JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s" +JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file %1$s to %2$s." +JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla! 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed." +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database
joomla.library: %1$s - %2$s" + +; Strings for the language debugger +JDEBUG_LANGUAGE_FILES_IN_ERROR="Parsing errors in language files" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Untranslated strings" +JNONE="None" + +; Necessary for errors +ADMIN_EMAIL="Administrator Email" +ADMIN_PASSWORD="Administrator Password" +ADMIN_PASSWORD2="Confirm Administrator Password" +SITE_NAME="Site Name" + +; Database types (allows for a more descriptive label than the internal name) +MYSQL="MySQL" +MYSQLI="MySQLi" +ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" +POSTGRESQL="PostgreSQL" +SQLAZURE="Microsoft SQL Azure" +SQLITE="SQLite" +SQLSRV="Microsoft SQL Server" + +; Javascript message titles +ERROR="Error" +MESSAGE="Message" +NOTICE="Notice" +WARNING="Warning" + +; Javascript ajax error messages +JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection abort has occurred while fetching the JSON data." +JLIB_JS_AJAX_ERROR_NO_CONTENT="No content was returned." +JLIB_JS_AJAX_ERROR_OTHER="An error has occurred while fetching the JSON data: HTTP %s status code." +JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:
%s"
+JLIB_JS_AJAX_ERROR_TIMEOUT="A timeout has occurred while fetching the JSON data."
diff --git a/installation/language/en-NZ/en-NZ.xml b/installation/language/en-NZ/en-NZ.xml
new file mode 100644
index 0000000000000..56a98a8351912
--- /dev/null
+++ b/installation/language/en-NZ/en-NZ.xml
@@ -0,0 +1,20 @@
+
+%s"
JLIB_JS_AJAX_ERROR_TIMEOUT="Un délai d’attente (timeout) s'est produit lors de la récupération des données JSON."
-
-[French specific]
-
-INSTL_SAMPLE_BLOG_FR_SET="Données exemples de type blog, en français"
-INSTL_SAMPLE_BROCHURE_FR_SET="Données exemples de type brochure, en français"
-INSTL_SAMPLE_DATA_FR_SET="Simple page d'accueil, en français"
-INSTL_SAMPLE_LEARN_FR_SET="Données exemples pour apprendre Joomla, en français"
-INSTL_SAMPLE_TESTING_FR_SET="Données exemples pour tester Joomla, en français"
-INSTL_SAMPLE_BLOG_FR_SET_DESC="Installer Joomla avec quelques articles et des modules de type blog tels que Articles Archivés, Articles les plus consultés, etc."
-INSTL_SAMPLE_BROCHURE_FR_SET_DESC="Installer Joomla avec quelques pages (un menu avec Page d'acceuil, A propos de nous, Nouvelles, Nous contacter) et des modules comme Recherche, Contenu personnalisé, Formulaire de connexion."
-INSTL_SAMPLE_DATA_FR_SET_DESC="Installer Joomla avec une page (un menu avec un lien) et des modules comme Derniers Articles, Formulaire de connexion."
-INSTL_SAMPLE_LEARN_FR_SET_DESC="Installer Joomla avec des exemples d'articles décrivant la façon dont Joomla fonctionne."
-INSTL_SAMPLE_TESTING_FR_SET_DESC="Installer Joomla avec tous les liens de menu possible pour aider à tester Joomla."
diff --git a/installation/language/fr-FR/fr-FR.ini b/installation/language/fr-FR/fr-FR.ini
index 8c5983bba3929..56d21f98791ec 100644
--- a/installation/language/fr-FR/fr-FR.ini
+++ b/installation/language/fr-FR/fr-FR.ini
@@ -277,7 +277,7 @@ JCHECK_AGAIN="Vérifier à nouveau"
JERROR="Erreur"
JEMAIL="E-mail"
JGLOBAL_ISFREESOFTWARE="%s est un logiciel libre sous %s"
-JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Le paquet de langue ne coincïde pas avec cette version de Joomla!. Certaines chaines peuvent manquer et seront affichées en anglais."
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Le paquet de langue ne coïncide pas avec cette version de Joomla!. Certaines chaines peuvent manquer et seront affichées en anglais."
JGLOBAL_SELECT_AN_OPTION="Sélectionner une option"
JGLOBAL_SELECT_NO_RESULTS_MATCH="Aucun résultat correspondant"
JGLOBAL_SELECT_SOME_OPTIONS="Sélectionner certaines options"
diff --git a/installation/language/nl-NL/nl-NL.ini b/installation/language/nl-NL/nl-NL.ini
index ad7512e1107fb..a139921267463 100644
--- a/installation/language/nl-NL/nl-NL.ini
+++ b/installation/language/nl-NL/nl-NL.ini
@@ -29,7 +29,7 @@ INSTL_PRECHECK_ACTUAL="Huidige waarde"
; Database view
INSTL_DATABASE="Database configuratie"
INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL database-query is mislukt."
-INSTL_DATABASE_HOST_DESC="Dit is meestal "_QQ_"localhost"_QQ_""
+INSTL_DATABASE_HOST_DESC="Dit is meestal "_QQ_"localhost"_QQ_" of een naam die door de webhost is doorgegeven."
INSTL_DATABASE_HOST_LABEL="Naam host"
INSTL_DATABASE_NAME_DESC="Sommige hostingproviders staan slechts één databasenaam toe per account. In dat geval kunt u een ander tabelvoorvoegsel gebruiken om onderscheid te maken tussen verschillende Joomla! installaties."
INSTL_DATABASE_NAME_LABEL="Naam database"
@@ -43,7 +43,7 @@ INSTL_DATABASE_PREFIX_LABEL="Tabelvoorvoegsel"
INSTL_DATABASE_PREFIX_MSG="Het voorvoegsel van de database moet beginnen met een letter gevolgd door optioneel alfanumerieke tekens en een onderstrepingsteken"
INSTL_DATABASE_TYPE_DESC="Dit is waarschijnlijk "_QQ_"MySQLi"_QQ_""
INSTL_DATABASE_TYPE_LABEL="Databasetype"
-INSTL_DATABASE_USER_DESC="Dit kan de standaard MySQL gebruikersnaam "_QQ_"root"_QQ_" zijn of een gebruikersnaam die de hostingprovider heeft opgegeven"
+INSTL_DATABASE_USER_DESC="Een gebruikersnaam door uzelf aangemaakt, of een gebruikersnaam die door de webhost is doorgegeven."
INSTL_DATABASE_USER_LABEL="Gebruikersnaam"
@@ -159,18 +159,19 @@ INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla heeft %s ingesteld als de standa
INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Selecteer"
INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Taal"
INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Tag"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla kon de inhoudstaal %s niet automatisch aanmaken"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla kon het menu %s niet automatisch aanmaken"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla kon de standaard pagina voor %s niet aanmaken"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla kon de menumodule voor %s niet automatisch aanmaken"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla kon de artikelcategorie voor %s niet automatisch aanmaken"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla kon het bijbehorende artikel voor %s niet automatisch aanmaken"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla kon de taalselectiemodule niet automatisch publiceren"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla kon de taalcodeplugin niet automatisch inschakelen"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla kon de taalfilterplugin niet automatisch inschakelen"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ADD_ASSOCIATIONS="Joomla was niet in staat om automatisch de taalkoppelingen aan te maken."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla kon de inhoudstaal %s niet automatisch aanmaken."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla kon het menu %s niet automatisch aanmaken."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla kon de standaard pagina voor %s niet aanmaken."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla kon de menumodule voor %s niet automatisch aanmaken."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla kon de artikelcategorie voor %s niet automatisch aanmaken."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla kon het bijbehorende artikel voor %s niet automatisch aanmaken."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla kon de taalselectiemodule niet automatisch publiceren."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla kon de taalcodeplugin niet automatisch inschakelen."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla kon de taalfilterplugin niet automatisch inschakelen."
INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla kan de taal %s niet installeren."
-INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla kon de meertalige statusmodule niet automatisch publiceren"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla kon de standaard menumodule niet automatisch depubliceren"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla kon de meertalige statusmodule niet automatisch publiceren."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla kon de standaard menumodule niet automatisch depubliceren."
INSTL_DEFAULTLANGUAGE_DESC="Joomla heeft de volgende talen geïnstalleerd. Selecteer de gewenste standaard taal voor het beheergedeelte."
INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla heeft de volgende talen geïnstalleerd. Selecteer de gewenste standaard taal voor de website."
INSTL_DEFAULTLANGUAGE_FRONTEND="Standaard taal website"
@@ -276,7 +277,7 @@ JCHECK_AGAIN="Controleer opnieuw"
JERROR="Fout"
JEMAIL="E-mail"
JGLOBAL_ISFREESOFTWARE="%s is vrije software vrijgegeven onder de %s."
-JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Taalpakket komt niet overeen met deze Joomla! versie. Er kunnen enkele taalstrings ontbreken."
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Taalpakket komt niet overeen met deze Joomla! versie. Er kunnen enkele taalstrings ontbreken, deze worden in het Engels weergegeven."
JGLOBAL_SELECT_AN_OPTION="Selecteer een optie"
JGLOBAL_SELECT_NO_RESULTS_MATCH="Er zijn geen overeenkomende resultaten"
JGLOBAL_SELECT_SOME_OPTIONS="Selecteer enkele opties"
@@ -326,3 +327,16 @@ SQLAZURE="Microsoft SQL Azure"
SQLITE="SQLite"
SQLSRV="Microsoft SQL Server"
+; Javascript message titles
+ERROR="Fout"
+MESSAGE="Bericht"
+NOTICE="Attentie"
+WARNING="Waarschuwing"
+
+; Javascript ajax error messages
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="De verbinding is verbroken bij het ophalen van de JSON-gegevens."
+JLIB_JS_AJAX_ERROR_NO_CONTENT="Er is geen inhoud teruggegeven."
+JLIB_JS_AJAX_ERROR_OTHER="Er is een fout opgetreden bij het ophalen van de JSON-gegevens: HTTP-statuscode %s."
+JLIB_JS_AJAX_ERROR_PARSE="Er is een parse-fout opgetreden bij het verwerken van de volgende JSON-gegevens:%s"
+JLIB_JS_AJAX_ERROR_TIMEOUT="Er is een time-out opgetreden bij het ophalen van de JSON-gegevens."
+
diff --git a/installation/language/nl-NL/nl-NL.xml b/installation/language/nl-NL/nl-NL.xml
index ce7b7f69caf16..a5015549de85a 100644
--- a/installation/language/nl-NL/nl-NL.xml
+++ b/installation/language/nl-NL/nl-NL.xml
@@ -3,8 +3,8 @@
version="3.6"
client="installation">
UžÃvateľ asi nemá dostatoÄné oprávnenia na vytvorenie databázy. Požadovaná databáza môže byÅ¥ vytvorená osobitne pred zaÄatÃm inÅ¡talácie systému Joomla!." +INSTL_DATABASE_ERROR_CREATE="PoÄas pokusu vytvoriÅ¥ databázu %s doÅ¡lo k chybe.
PožÃvateľ asi nemá dostatoÄné oprávnenia na vytvorenie databázy. Požadovaná databáza môže byÅ¥ vytvorená osobitne pred zaÄatÃm inÅ¡talácie systému Joomla!." INSTL_DATABASE_ERROR_DELETE="PoÄas mazania databázy doÅ¡lo k chybám." INSTL_DATABASE_FIELD_VALUE_REMOVE="OdstrániÅ¥" INSTL_DATABASE_FIELD_VALUE_BACKUP="ZálohovaÅ¥" @@ -289,7 +289,7 @@ JOFF="Vyp." JON="Zap." JPREVIOUS="Späť" JSITE="Web" -JUSERNAME="Meno užÃvateľa" +JUSERNAME="Meno použÃvateľa" JYES="Ãno" ; Framework strings necessary when no lang pack is available diff --git a/installation/model/database.php b/installation/model/database.php index b9a5755468de9..1aa1ce80129ee 100644 --- a/installation/model/database.php +++ b/installation/model/database.php @@ -90,7 +90,7 @@ public static function getUserId() */ public function initialise($options) { - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Load the backend language files so that the DB error messages work. @@ -214,7 +214,7 @@ public function createDatabase($options) return false; } - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Check database version. @@ -428,7 +428,7 @@ public function handleOldDatabase($options) return false; } - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Set the character set to UTF-8 for pre-existing databases. @@ -477,7 +477,7 @@ public function createTables($options) return false; } - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Check database type. @@ -716,7 +716,7 @@ public function installSampleData($options) return false; } - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Build the path to the sample data file. diff --git a/installation/model/ftp.php b/installation/model/ftp.php index d2cac2e55f3a4..2e8c23c088fbf 100644 --- a/installation/model/ftp.php +++ b/installation/model/ftp.php @@ -29,7 +29,7 @@ class InstallationModelFtp extends JModelBase */ public function detectFtpRoot($options) { - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Connect and login to the FTP server. @@ -148,7 +148,7 @@ public function detectFtpRoot($options) */ public function verifyFtpSettings($options) { - // Get the options as a object for easier handling. + // Get the options as an object for easier handling. $options = ArrayHelper::toObject($options); // Connect and login to the FTP server. diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index 6a8c65164bd39..e9ac270eff6d6 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -621,10 +621,10 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder` (504, 'hathor', 'template', 'hathor', '', 1, 1, 1, 0, '', '{"showSiteName":"0","colourChoice":"0","boldText":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (506, 'protostar', 'template', 'protostar', '', 0, 1, 1, 0, '', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (507, 'isis', 'template', 'isis', '', 1, 1, 1, 0, '', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(600, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(601, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(802, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0); +(802, 'English (en-GB) Language Pack', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0); -- -------------------------------------------------------- @@ -1212,7 +1212,7 @@ CREATE TABLE IF NOT EXISTS `#__languages` ( -- INSERT INTO `#__languages` (`lang_id`, `lang_code`, `title`, `title_native`, `sef`, `image`, `description`, `metakey`, `metadesc`, `sitename`, `published`, `access`, `ordering`) VALUES -(1, 'en-GB', 'English (UK)', 'English (UK)', 'en', 'en_gb', '', '', '', '', 1, 1, 1); +(1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1); -- -------------------------------------------------------- diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index 958123450d787..231c45b6271ab 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -627,8 +627,8 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder" -- Languages INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES -(600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); +(600, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(601, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); -- Files Extensions INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES @@ -636,7 +636,7 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder" -- Packages INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES -(802, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); +(802, 'English (en-GB) Language Pack', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); SELECT setval('#__extensions_extension_id_seq', 10000, false); @@ -1148,7 +1148,7 @@ CREATE INDEX "#__languages_idx_access" ON "#__languages" ("access"); -- Dumping data for table #__languages -- INSERT INTO "#__languages" ("lang_id", "lang_code", "title", "title_native", "sef", "image", "description", "metakey", "metadesc", "sitename", "published", "access", "ordering") VALUES -(1, 'en-GB', 'English (UK)', 'English (UK)', 'en', 'en_gb', '', '', '', '', 1, 1, 1); +(1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1); SELECT setval('#__languages_lang_id_seq', 2, false); diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql index d8e87745db9db..336a90f8d0a8c 100644 --- a/installation/sql/sqlazure/joomla.sql +++ b/installation/sql/sqlazure/joomla.sql @@ -1030,9 +1030,9 @@ SELECT 507, 'isis', 'template', 'isis', '', 1, 1, 1, 0, '', '{"templateColor":"" -- Languages INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) -SELECT 600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0 +SELECT 600, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0 UNION ALL -SELECT 601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; +SELECT 601, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; -- Files Extensions INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) @@ -1040,7 +1040,7 @@ SELECT 700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, -- Packages INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) -SELECT 802, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; +SELECT 802, 'English (en-GB) Language Pack', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; SET IDENTITY_INSERT [#__extensions] OFF; @@ -2016,7 +2016,7 @@ CREATE UNIQUE INDEX [idx_access] ON [#__languages] SET IDENTITY_INSERT [#__languages] ON; INSERT INTO [#__languages] ([lang_id], [lang_code], [title], [title_native], [sef], [image], [description], [metakey], [metadesc], [sitename], [published], [access], [ordering]) -SELECT 1, 'en-GB', 'English (UK)', 'English (UK)', 'en', 'en_gb', '', '', '', '', 1, 1, 1; +SELECT 1, 'en-GB', 'English (en-GB)', 'English (United Kingdom)', 'en', 'en_gb', '', '', '', '', 1, 1, 1; SET IDENTITY_INSERT [#__languages] OFF; diff --git a/installation/template/css/template.css b/installation/template/css/template.css index 6254a80476f34..730694a901fc2 100644 --- a/installation/template/css/template.css +++ b/installation/template/css/template.css @@ -131,3 +131,86 @@ textarea.noResize { .tooltip { white-space: pre-wrap; } + +/* Flat Repaint */ +.btn { + background-image: none; + border: 1px solid rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} +.btn-primary:hover, .btn-primary:focus { + background-color: #185b91; + color: #fff; + text-decoration: none; +} +.chzn-container-single .chzn-single { + background-color: #ffffff; + background-image: none; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 3px; + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); + height: auto; + line-height: 26px; +} +.chzn-container-single .chzn-single div { + background-color: #f3f3f3; + border-left: 1px solid #cccccc; + text-align: center; + width: 28px; + height: auto; + bottom: 0; +} +.chzn-container-single .chzn-drop { + background-clip: padding-box; + border-color: #0088cc; +} +.chzn-container-active .chzn-single { + color: #0088cc; +} +.chzn-container-active.chzn-with-drop .chzn-single div { + border-bottom: 1px solid #cccccc; + border-bottom-left-radius: 3px; + background-color: #f3f3f3; + border-left: 1px solid #cccccc; +} +.chzn-container-single .chzn-single div b { + background-position: 2px 2px; + display: inline-block; + height: 16px; + width: 16px; +} +.chzn-container-active.chzn-with-drop .chzn-single div b { + background-position: -16px 2px; +} +.chzn-container-active.chzn-with-drop .chzn-single { + background-image: none; + border: 1px solid #0088cc; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} + +.chzn-container .chzn-results { + background-color: #fff; + border-radius: 0 0 3px 3px; + margin: 0; + padding: 0; +} +.chzn-container-single .chzn-search input[type="text"] { + border: 1px solid #aaa; + border-radius: 3px; + box-shadow: none; + background: transparent url("../../../media/jui/css/chosen-sprite.png") no-repeat scroll 100% -20px +} +.chzn-container .chzn-results li.highlighted { + background-color: #0088cc; + background-image: none; +} +.chzn-container-single .chzn-search input[type="text"]:focus { + border-color: #0088cc; +} +fieldset { + margin-bottom: 10px; +} +textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input { + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); +} diff --git a/installation/template/index.php b/installation/template/index.php index b290bcdfd8569..c85e99d1fe45f 100644 --- a/installation/template/index.php +++ b/installation/template/index.php @@ -10,10 +10,6 @@ /** @var JDocumentHtml $this */ -// Add Stylesheets -JHtml::_('bootstrap.loadCss', true, $this->direction); -JHtml::_('stylesheet', 'installation/template/css/template.css'); - // Load the JavaScript behaviors JHtml::_('bootstrap.framework'); JHtml::_('formbehavior.chosen', 'select'); @@ -21,6 +17,10 @@ JHtml::_('behavior.formvalidator'); JHtml::_('script', 'installation/template/js/installation.js'); +// Add Stylesheets +JHtml::_('bootstrap.loadCss', true, $this->direction); +JHtml::_('stylesheet', 'installation/template/css/template.css'); + // Load JavaScript message titles JText::script('ERROR'); JText::script('WARNING'); diff --git a/language/en-GB/en-GB.com_contact.ini b/language/en-GB/en-GB.com_contact.ini index 26fb09a4d1805..3948802802169 100644 --- a/language/en-GB/en-GB.com_contact.ini +++ b/language/en-GB/en-GB.com_contact.ini @@ -10,7 +10,7 @@ COM_CONTACT_CAPTCHA_DESC="Please complete the security check." COM_CONTACT_CAT_NUM="# of Contacts :" COM_CONTACT_CONTACT_DEFAULT_LABEL="Send an Email" COM_CONTACT_CONTACT_EMAIL_A_COPY_DESC="Sends a copy of the message to the address you have supplied." -COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL="Send copy to yourself" +COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL="Send a copy to yourself" COM_CONTACT_CONTACT_EMAIL_NAME_DESC="Your name." COM_CONTACT_CONTACT_EMAIL_NAME_LABEL="Name" COM_CONTACT_CONTACT_ENTER_MESSAGE_DESC="Enter your message here." diff --git a/language/en-GB/en-GB.com_media.ini b/language/en-GB/en-GB.com_media.ini index 6734833c394ef..5befff0ce864a 100644 --- a/language/en-GB/en-GB.com_media.ini +++ b/language/en-GB/en-GB.com_media.ini @@ -71,6 +71,4 @@ COM_MEDIA_UP="Up" COM_MEDIA_UPLOAD="Upload" COM_MEDIA_UPLOAD_COMPLETE="Upload Complete" COM_MEDIA_UPLOAD_FILE="Upload file" -COM_MEDIA_UPLOAD_FILES="Upload files (Maximum Size: %s MB)" -COM_MEDIA_UPLOAD_FILES_NOLIMIT="Upload files (No maximum size)" COM_MEDIA_UPLOAD_SUCCESSFUL="Upload Successful" diff --git a/language/en-GB/en-GB.com_users.ini b/language/en-GB/en-GB.com_users.ini index fc3453aa3fb30..ecd22d3b91415 100644 --- a/language/en-GB/en-GB.com_users.ini +++ b/language/en-GB/en-GB.com_users.ini @@ -70,7 +70,7 @@ COM_USERS_PROFILE_EMAIL1_DESC="Enter your email address." COM_USERS_PROFILE_EMAIL1_LABEL="Email Address" COM_USERS_PROFILE_EMAIL1_MESSAGE="The email address you entered is already in use or invalid. Please enter another email address." COM_USERS_PROFILE_EMAIL2_DESC="Confirm your email address." -COM_USERS_PROFILE_EMAIL2_LABEL="Confirm email Address" +COM_USERS_PROFILE_EMAIL2_LABEL="Confirm Email Address" COM_USERS_PROFILE_EMAIL2_MESSAGE="The email addresses you entered do not match. Please enter your email address in the email address field and confirm your entry by entering it in the confirm email address field." COM_USERS_PROFILE_LAST_VISITED_DATE_LABEL="Last Visited Date" COM_USERS_PROFILE_MY_PROFILE="My Profile" @@ -101,7 +101,7 @@ COM_USERS_REGISTER_EMAIL1_DESC="Enter your email address." COM_USERS_REGISTER_EMAIL1_LABEL="Email Address" COM_USERS_REGISTER_EMAIL1_MESSAGE="The email address you entered is already in use or invalid. Please enter another email address." COM_USERS_REGISTER_EMAIL2_DESC="Confirm your email address." -COM_USERS_REGISTER_EMAIL2_LABEL="Confirm email Address" +COM_USERS_REGISTER_EMAIL2_LABEL="Confirm Email Address" COM_USERS_REGISTER_EMAIL2_MESSAGE="The email addresses you entered do not match. Please enter your email address in the email address field and confirm your entry by entering it in the confirm email address field." COM_USERS_REGISTER_NAME_DESC="Enter your full name." COM_USERS_REGISTER_NAME_LABEL="Name" diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini index 6dcacb0d8cd26..932947d277e03 100644 --- a/language/en-GB/en-GB.ini +++ b/language/en-GB/en-GB.ini @@ -234,6 +234,7 @@ JGLOBAL_KEEP_TYPING="Keep typing ..." JGLOBAL_LEFT="Left" JGLOBAL_LOOKING_FOR="Looking for" JGLOBAL_LT="<" +JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT="Maximum upload size: %s" JGLOBAL_NEWITEMSLAST_DESC="New items default to the last position. Ordering can be changed after this item has been saved." JGLOBAL_NO_MATCHING_RESULTS="No Matching Results" JGLOBAL_NUM="#" diff --git a/language/en-GB/en-GB.tpl_protostar.ini b/language/en-GB/en-GB.tpl_protostar.ini index 0d7ec7e1e582d..15697fbd53ee6 100644 --- a/language/en-GB/en-GB.tpl_protostar.ini +++ b/language/en-GB/en-GB.tpl_protostar.ini @@ -20,4 +20,5 @@ TPL_PROTOSTAR_FONT_NAME_DESC="Example: Open+Sans or Source+Sans+Pro." TPL_PROTOSTAR_LOGO_LABEL="Logo" TPL_PROTOSTAR_LOGO_DESC="Select or upload a custom logo for the site template." TPL_PROTOSTAR_STATIC="Static" +TPL_PROTOSTAR_TOGGLE_MENU="Toggle Navigation" diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index 691eb433b5e35..ae53d68e42998 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -1,7 +1,7 @@
get('show_title')) : ?>
diff --git a/layouts/joomla/content/categories_default_items.php b/layouts/joomla/content/categories_default_items.php
index 972c8ae960be6..e87c181bad1bf 100644
--- a/layouts/joomla/content/categories_default_items.php
+++ b/layouts/joomla/content/categories_default_items.php
@@ -19,7 +19,7 @@
$className = substr($extension, 4);
// This will work for the core components but not necessarily for other components
// that may have different pluralisation rules.
-if (substr($className, -1) == 's')
+if (substr($className, -1) === 's')
{
$className = rtrim($className, 's');
}
diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php
index 7fe72394aa99e..8f53e7e19f0b6 100644
--- a/layouts/joomla/content/category_default.php
+++ b/layouts/joomla/content/category_default.php
@@ -22,7 +22,7 @@
* This will work for the core components but not necessarily for other components
* that may have different pluralisation rules.
*/
-if (substr($className, -1) == 's')
+if (substr($className, -1) === 's')
{
$className = rtrim($className, 's');
}
@@ -59,7 +59,7 @@
loadTemplate($displayData->subtemplatename); ?>
- get('children') && $displayData->maxLevel != 0) : ?>
+ maxLevel != 0 && $displayData->get('children')) : ?>
@@ -39,8 +39,9 @@ - publish_down) < strtotime(JFactory::getDate())) - && $displayData->publish_down != JFactory::getDbo()->getNullDate()) : ?> + publish_down != JFactory::getDbo()->getNullDate() + && (strtotime($displayData->publish_down) < strtotime(JFactory::getDate())) + ) : ?>
get('show_category_heading_title_text', 1) == 1) : ?>
diff --git a/layouts/joomla/content/info_block/associations.php b/layouts/joomla/content/info_block/associations.php
index 3de4da6dc291a..37f65bc022518 100644
--- a/layouts/joomla/content/info_block/associations.php
+++ b/layouts/joomla/content/info_block/associations.php
@@ -14,7 +14,7 @@
diff --git a/layouts/joomla/content/info_block/associations.php b/layouts/joomla/content/info_block/associations.php
index 3de4da6dc291a..37f65bc022518 100644
--- a/layouts/joomla/content/info_block/associations.php
+++ b/layouts/joomla/content/info_block/associations.php
@@ -14,7 +14,7 @@
- params->get('flags', 1)) : ?>
+ params->get('flags', 1) && $association['language']->image) : ?>
image . '.gif', $association['language']->title_native, array('title' => $association['language']->title_native), true); ?>
diff --git a/layouts/joomla/content/info_block/author.php b/layouts/joomla/content/info_block/author.php
index 8c8d332e92b0d..29a2d5363699d 100644
--- a/layouts/joomla/content/info_block/author.php
+++ b/layouts/joomla/content/info_block/author.php
@@ -11,7 +11,7 @@
?>
- created_by_alias ? $displayData['item']->created_by_alias : $displayData['item']->author); ?>
+ created_by_alias ?: $displayData['item']->author); ?>
' . $author . ''; ?>
contact_link ) && $displayData['params']->get('link_author') == true) : ?>
contact_link, $author, array('itemprop' => 'url'))); ?>
diff --git a/layouts/joomla/content/info_block/block.php b/layouts/joomla/content/info_block/block.php
index 67467188b7335..514eaeacc7e25 100644
--- a/layouts/joomla/content/info_block/block.php
+++ b/layouts/joomla/content/info_block/block.php
@@ -14,8 +14,8 @@
?>
-
-
@@ -46,8 +46,8 @@
-
get('show_create_date')) : ?>
diff --git a/layouts/joomla/content/intro_image.php b/layouts/joomla/content/intro_image.php
index b3cc17651e2d4..77c6460118945 100644
--- a/layouts/joomla/content/intro_image.php
+++ b/layouts/joomla/content/intro_image.php
@@ -12,7 +12,7 @@
?>
images); ?>
image_intro) && !empty($images->image_intro)) : ?>
- float_intro)) ? $params->get('float_intro') : $images->float_intro; ?>
+ float_intro) ? $params->get('float_intro') : $images->float_intro; ?>
get('link_titles') && $params->get('access-view')) : ?>
![]()
language == '')
+{
+ echo JText::_('JDEFAULT');
+}
+elseif ($item->language == '*')
+{
+ echo JText::alt('JALL', 'language');
+}
+elseif ($item->language_image)
+{
+ echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, null, true) . ' ' . htmlspecialchars($item->language_title, ENT_COMPAT, 'UTF-8');
+}
+elseif ($item->language_title)
+{
+ echo htmlspecialchars($item->language_title, ENT_COMPAT, 'UTF-8');
+}
+else
+{
+ echo JText::_('JUNDEFINED');
+}
diff --git a/layouts/joomla/content/options_default.php b/layouts/joomla/content/options_default.php
index 04df19d2b90dd..83e96a8817000 100644
--- a/layouts/joomla/content/options_default.php
+++ b/layouts/joomla/content/options_default.php
@@ -39,7 +39,7 @@
$showonarr[] = array(
'field' => $displayData->form->getFormControl() . '[' . $displayData->form->getFieldAttribute($showon[0], 'name') . ']',
'values' => explode(',', $showon[1]),
- 'op' => (preg_match('%\[(AND|OR)\]' . $showonfield . '%', $showonstring, $matches)) ? $matches[1] : ''
+ 'op' => preg_match('%\[(AND|OR)\]' . $showonfield . '%', $showonstring, $matches) ? $matches[1] : ''
);
}
diff --git a/layouts/joomla/content/readmore.php b/layouts/joomla/content/readmore.php
index 1a66d0640f0eb..be5227e39e7fa 100644
--- a/layouts/joomla/content/readmore.php
+++ b/layouts/joomla/content/readmore.php
@@ -21,13 +21,13 @@
elseif ($readmore = $item->alternative_readmore) :
echo $readmore;
if ($params->get('show_readmore_title', 0) != 0) :
- echo JHtml::_('string.truncate', ($item->title), $params->get('readmore_limit'));
+ echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit'));
endif;
elseif ($params->get('show_readmore_title', 0) == 0) :
echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE');
else :
echo JText::_('COM_CONTENT_READ_MORE');
- echo JHtml::_('string.truncate', ($item->title), $params->get('readmore_limit'));
+ echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit'));
endif; ?>
diff --git a/layouts/joomla/edit/associations.php b/layouts/joomla/edit/associations.php
index b921a18edcf69..62229972698f3 100644
--- a/layouts/joomla/edit/associations.php
+++ b/layouts/joomla/edit/associations.php
@@ -10,7 +10,7 @@
defined('JPATH_BASE') or die;
// JLayout for standard handling of associations fields in the administrator items edit screens.
-if ($displayData->getForm()->getValue('id') != 0 && $displayData->getForm()->getValue('language') != "*")
+if ($displayData->getForm()->getValue('id') != 0 && $displayData->getForm()->getValue('language') !== '*')
{
echo $displayData->getForm()->renderFieldset('item_associations');
}
diff --git a/layouts/joomla/edit/frontediting_modules.php b/layouts/joomla/edit/frontediting_modules.php
index 64cb3ccea6361..74a52d35b8fd3 100644
--- a/layouts/joomla/edit/frontediting_modules.php
+++ b/layouts/joomla/edit/frontediting_modules.php
@@ -28,7 +28,7 @@
// Add css class jmoddiv and data attributes for module-editing URL and for the tooltip:
$editUrl = JUri::base() . 'administrator/index.php?option=com_modules&task=module.edit&id=' . (int) $mod->id;
-if ($parameters->get('redirect_edit', 'site') == 'site')
+if ($parameters->get('redirect_edit', 'site') === 'site')
{
$editUrl = JUri::base() . 'index.php?option=com_config&controller=config.display.modules&id=' . (int) $mod->id . $redirectUri;
$target = '_self';
@@ -48,7 +48,7 @@
)
. '"'
// And if menu editing is enabled and allowed and it's a menu module, add data attributes for menu editing:
- . ($menusEditing && $mod->module == 'mod_menu' ?
+ . ($menusEditing && $mod->module === 'mod_menu' ?
'" data-jmenuedittip="' . JHtml::tooltipText('JLIB_HTML_EDIT_MENU_ITEM', 'JLIB_HTML_EDIT_MENU_ITEM_ID') . '"'
:
''
diff --git a/layouts/joomla/edit/global.php b/layouts/joomla/edit/global.php
index a88ed84c74152..0abcfc5986511 100644
--- a/layouts/joomla/edit/global.php
+++ b/layouts/joomla/edit/global.php
@@ -14,7 +14,7 @@
$input = $app->input;
$component = $input->getCmd('option', 'com_content');
-if ($component == 'com_categories')
+if ($component === 'com_categories')
{
$extension = $input->getCmd('extension', 'com_content');
$parts = explode('.', $extension);
diff --git a/layouts/joomla/edit/metadata.php b/layouts/joomla/edit/metadata.php
index b1cc161d5b4c0..67f8fc349dfe3 100644
--- a/layouts/joomla/edit/metadata.php
+++ b/layouts/joomla/edit/metadata.php
@@ -22,7 +22,7 @@
renderField('metadesc');
echo $form->renderField('metakey');
@@ -31,7 +31,7 @@
foreach ($form->getFieldset($name) as $field)
{
- if ($field->name != 'jform[metadata][tags][]')
+ if ($field->name !== 'jform[metadata][tags][]')
{
echo $field->renderField();
}
diff --git a/layouts/joomla/edit/params.php b/layouts/joomla/edit/params.php
index 17095fb368413..69f6a545b3d57 100644
--- a/layouts/joomla/edit/params.php
+++ b/layouts/joomla/edit/params.php
@@ -39,9 +39,10 @@
foreach ($fieldSets as $name => $fieldSet)
{
// Ensure any fieldsets we don't want to show are skipped (including repeating formfield fieldsets)
- if (in_array($name, $ignoreFieldsets) || (!empty($configFieldsets) && in_array($name, $configFieldsets))
- || !empty($hiddenFieldsets) && in_array($name, $hiddenFieldsets)
- || (isset($fieldSet->repeat) && $fieldSet->repeat == true)
+ if ((isset($fieldSet->repeat) && $fieldSet->repeat == true)
+ || in_array($name, $ignoreFieldsets)
+ || (!empty($configFieldsets) && in_array($name, $configFieldsets))
+ || (!empty($hiddenFieldsets) && in_array($name, $hiddenFieldsets))
)
{
continue;
@@ -54,7 +55,7 @@
else
{
$label = strtoupper('JGLOBAL_FIELDSET_' . $name);
- if (JText::_($label) == $label)
+ if (JText::_($label) === $label)
{
$label = strtoupper($app->input->get('option') . '_' . $name . '_FIELDSET_LABEL');
}
diff --git a/layouts/joomla/editors/buttons/button.php b/layouts/joomla/editors/buttons/button.php
index 43c3ef278f35d..c8a989724c7aa 100644
--- a/layouts/joomla/editors/buttons/button.php
+++ b/layouts/joomla/editors/buttons/button.php
@@ -14,11 +14,11 @@
?>
get('name')) : ?>
get('class')) ? $button->get('class') : null;
- $class .= ($button->get('modal')) ? ' modal-button' : null;
- $href = ($button->get('link')) ? ' href="' . JUri::base() . $button->get('link') . '"' : null;
- $onclick = ($button->get('onclick')) ? ' onclick="' . $button->get('onclick') . '"' : '';
- $title = ($button->get('title')) ? $button->get('title') : $button->get('text');
+ $class = $button->get('class') ?: null;
+ $class .= $button->get('modal') ? ' modal-button' : null;
+ $href = $button->get('link') ? ' href="' . JUri::base() . $button->get('link') . '"' : null;
+ $onclick = $button->get('onclick') ? ' onclick="' . $button->get('onclick') . '"' : '';
+ $title = $button->get('title') ?: $button->get('text');
// Load modal popup behavior
if ($button->get('modal'))
diff --git a/layouts/joomla/form/field/file.php b/layouts/joomla/form/field/file.php
index 4100a3ad501b7..0d3d8c93af853 100644
--- a/layouts/joomla/form/field/file.php
+++ b/layouts/joomla/form/field/file.php
@@ -48,6 +48,8 @@
// Including fallback code for HTML5 non supported browsers.
JHtml::_('jquery.framework');
JHtml::_('script', 'system/html5fallback.js', false, true);
+
+$maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize());
?>
- />
+ />
+
diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php
index b44d7eca36186..dab5041ff5516 100644
--- a/layouts/joomla/form/field/media.php
+++ b/layouts/joomla/form/field/media.php
@@ -170,8 +170,7 @@
?>
>
diff --git a/layouts/joomla/form/field/radio.php b/layouts/joomla/form/field/radio.php
index 0f792ffc96261..d8dd181dd7439 100644
--- a/layouts/joomla/form/field/radio.php
+++ b/layouts/joomla/form/field/radio.php
@@ -63,7 +63,7 @@
$option) : ?>
value == $value) ? 'checked="checked"' : '';
+ $checked = ((string) $option->value === $value) ? 'checked="checked"' : '';
$optionClass = !empty($option->class) ? 'class="' . $option->class . '"' : '';
$disabled = !empty($option->disable) || ($disabled && !$checked) ? 'disabled' : '';
diff --git a/layouts/joomla/form/field/user.php b/layouts/joomla/form/field/user.php
index 37283b6c2d483..dded74d19a554 100644
--- a/layouts/joomla/form/field/user.php
+++ b/layouts/joomla/form/field/user.php
@@ -52,9 +52,9 @@
. (isset($excluded) ? ('&excluded=' . base64_encode(json_encode($excluded))) : '');
// Invalidate the input value if no user selected
-if (JText::_('JLIB_FORM_SELECT_USER') == htmlspecialchars($userName, ENT_COMPAT, 'UTF-8'))
+if (JText::_('JLIB_FORM_SELECT_USER') === htmlspecialchars($userName, ENT_COMPAT, 'UTF-8'))
{
- $userName = "";
+ $userName = '';
}
// Load the modal behavior script.
diff --git a/layouts/joomla/form/renderlabel.php b/layouts/joomla/form/renderlabel.php
index ecc6556c1df39..05ee30100d2cf 100644
--- a/layouts/joomla/form/renderlabel.php
+++ b/layouts/joomla/form/renderlabel.php
@@ -29,14 +29,14 @@
if (!empty($description))
{
- if ($text && $text != $description)
+ if ($text && $text !== $description)
{
JHtml::_('bootstrap.popover');
$classes[] = 'hasPopover';
$title = ' title="' . htmlspecialchars(trim($text, ':')) . '"'
. ' data-content="'. htmlspecialchars($description) . '"';
- if (JFactory::getLanguage()->isRtl() && !$position)
+ if (!$position && JFactory::getLanguage()->isRtl())
{
$position = ' data-placement="left" ';
}
diff --git a/layouts/joomla/pagination/link.php b/layouts/joomla/pagination/link.php
index 93a02edc72076..b7868e894f875 100644
--- a/layouts/joomla/pagination/link.php
+++ b/layouts/joomla/pagination/link.php
@@ -18,23 +18,23 @@
{
// Check for "Start" item
case JText::_('JLIB_HTML_START') :
- $icon = "icon-backward icon-first";
+ $icon = 'icon-backward icon-first';
break;
// Check for "Prev" item
- case $item->text == JText::_('JPREV') :
+ case $item->text === JText::_('JPREV') :
$item->text = JText::_('JPREVIOUS');
- $icon = "icon-step-backward icon-previous";
+ $icon = 'icon-step-backward icon-previous';
break;
// Check for "Next" item
case JText::_('JNEXT') :
- $icon = "icon-step-forward icon-next";
+ $icon = 'icon-step-forward icon-next';
break;
// Check for "End" item
case JText::_('JLIB_HTML_END') :
- $icon = "icon-forward icon-last";
+ $icon = 'icon-forward icon-last';
break;
default:
diff --git a/layouts/joomla/pagination/links.php b/layouts/joomla/pagination/links.php
index ea9f2a8dc15c6..fbc6bc65ced0b 100644
--- a/layouts/joomla/pagination/links.php
+++ b/layouts/joomla/pagination/links.php
@@ -38,7 +38,7 @@
if ($currentPage >= $step)
{
- if ($currentPage % $step == 0)
+ if ($currentPage % $step === 0)
{
$range = ceil($currentPage / $step) + 1;
}
@@ -66,7 +66,7 @@
-
+
).*?()#', '$1...$2', $output); ?>
diff --git a/layouts/joomla/searchtools/default/filters.php b/layouts/joomla/searchtools/default/filters.php
index 58eb9c997a8b9..d676219f6d769 100644
--- a/layouts/joomla/searchtools/default/filters.php
+++ b/layouts/joomla/searchtools/default/filters.php
@@ -24,7 +24,7 @@
$showonarr[] = array(
'field' => $showon[0],
'values' => explode(',', $showon[1]),
- 'op' => (preg_match('%\[(AND|OR)\]' . $showonfield . '%', $showonstring, $matches)) ? $matches[1] : ''
+ 'op' => preg_match('%\[(AND|OR)\]' . $showonfield . '%', $showonstring, $matches) ? $matches[1] : ''
);
}
$data['view']->filterForm->setFieldAttribute($field->fieldname, 'dataShowOn', json_encode($showonarr), $field->group);
@@ -36,7 +36,7 @@
?>
$field) : ?>
-
+
getAttribute('dataShowOn'))
diff --git a/layouts/joomla/searchtools/grid/sort.php b/layouts/joomla/searchtools/grid/sort.php
index 686d76546bf69..be337f31fcb42 100644
--- a/layouts/joomla/searchtools/grid/sort.php
+++ b/layouts/joomla/searchtools/grid/sort.php
@@ -11,7 +11,7 @@
$data = $displayData;
-$title = htmlspecialchars(JText::_($data->tip ? $data->tip : $data->title));
+$title = htmlspecialchars(JText::_($data->tip ?: $data->title));
JHtml::_('bootstrap.popover');
?>
hide) : ?>
+ if ($item[1] !== '') : ?>
diff --git a/layouts/joomla/tinymce/buttons.php b/layouts/joomla/tinymce/buttons.php
index 59f7ce8400641..2d699e8f98f5e 100644
--- a/layouts/joomla/tinymce/buttons.php
+++ b/layouts/joomla/tinymce/buttons.php
@@ -11,5 +11,3 @@
JLog::add('The layout joomla.tinymce.buttons is deprecated, use joomla.editors.buttons instead.', JLog::WARNING, 'deprecated');
echo JLayoutHelper::render('joomla.editors.buttons', $displayData);
-
-?>
diff --git a/layouts/joomla/tinymce/buttons/button.php b/layouts/joomla/tinymce/buttons/button.php
index 1970c089c51af..c492b4e3cebf4 100644
--- a/layouts/joomla/tinymce/buttons/button.php
+++ b/layouts/joomla/tinymce/buttons/button.php
@@ -11,5 +11,3 @@
JLog::add('The layout joomla.tinymce.buttons.button is deprecated, use joomla.editors.buttons.button instead.', JLog::WARNING, 'deprecated');
echo JLayoutHelper::render('joomla.editors.buttons.button', $displayData);
-
-?>
diff --git a/layouts/joomla/toolbar/popup.php b/layouts/joomla/toolbar/popup.php
index d95ce624568fc..f7177c70a62fd 100644
--- a/layouts/joomla/toolbar/popup.php
+++ b/layouts/joomla/toolbar/popup.php
@@ -7,7 +7,7 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
-defined('JPATH_BASE') or die;;
+defined('JPATH_BASE') or die;
JHtml::_('behavior.core');
diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php
index dd3e2f2eec2f4..99cb0f2f8f3f1 100644
--- a/libraries/cms/application/cms.php
+++ b/libraries/cms/application/cms.php
@@ -145,7 +145,7 @@ public function afterSessionStart()
if ($session->isNew())
{
- $session->set('registry', new Registry('session'));
+ $session->set('registry', new Registry);
$session->set('user', new JUser);
}
}
diff --git a/libraries/cms/application/site.php b/libraries/cms/application/site.php
index 1d08eb17f364d..6148ccd5b84d1 100644
--- a/libraries/cms/application/site.php
+++ b/libraries/cms/application/site.php
@@ -351,8 +351,7 @@ public function getParams($option = null)
// Get show_page_heading from com_menu global settings
$params[$hash]->def('show_page_heading', $temp->get('show_page_heading'));
- $temp = new Registry;
- $temp->loadString($menu->params);
+ $temp = new Registry($menu->params);
$params[$hash]->merge($temp);
$title = $menu->title;
}
@@ -484,9 +483,7 @@ public function getTemplate($params = false)
foreach ($templates as &$template)
{
- $registry = new Registry;
- $registry->loadString($template->params);
- $template->params = $registry;
+ $template->params = new Registry($template->params);
// Create home element
if ($template->home == 1 && !isset($templates[0]) || $this->_language_filter && $template->home == $tag)
@@ -521,9 +518,7 @@ public function getTemplate($params = false)
{
$template = $tmpl;
- $registry = new Registry;
- $registry->loadString($template->params);
- $template->params = $registry;
+ $template->params = new Registry($template->params);
break;
}
diff --git a/libraries/cms/component/helper.php b/libraries/cms/component/helper.php
index 879577feb49ed..8402b4d72cc6c 100644
--- a/libraries/cms/component/helper.php
+++ b/libraries/cms/component/helper.php
@@ -58,9 +58,7 @@ public static function getComponent($option, $strict = false)
if (is_string($result->params))
{
- $temp = new Registry;
- $temp->loadString(static::$components[$option]->params);
- static::$components[$option]->params = $temp;
+ static::$components[$option]->params = new Registry(static::$components[$option]->params);
}
return $result;
diff --git a/libraries/cms/component/router/view.php b/libraries/cms/component/router/view.php
index 411522abd85c3..f21b67dbc95df 100644
--- a/libraries/cms/component/router/view.php
+++ b/libraries/cms/component/router/view.php
@@ -83,7 +83,7 @@ public function getPath($query)
$key = false;
// Get the right view object
- if (isset($query['view']) && $views[$query['view']])
+ if (isset($query['view']) && isset($views[$query['view']]))
{
$viewobj = $views[$query['view']];
}
diff --git a/libraries/cms/editor/editor.php b/libraries/cms/editor/editor.php
index 60a824f166dfe..f230aaa4f019b 100644
--- a/libraries/cms/editor/editor.php
+++ b/libraries/cms/editor/editor.php
@@ -536,8 +536,7 @@ protected function _loadEditor($config = array())
return false;
}
- $params = new Registry;
- $params->loadString($plugin->params);
+ $params = new Registry($plugin->params);
$params->loadArray($config);
$plugin->params = $params;
diff --git a/libraries/cms/helper/media.php b/libraries/cms/helper/media.php
index ff48d93771d79..506ac4fdafc3b 100644
--- a/libraries/cms/helper/media.php
+++ b/libraries/cms/helper/media.php
@@ -63,7 +63,7 @@ public function canUpload($file, $component = 'com_media')
if (empty($file['name']))
{
- $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_UPLOAD_INPUT'), 'notice');
+ $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_UPLOAD_INPUT'), 'error');
return false;
}
@@ -72,7 +72,7 @@ public function canUpload($file, $component = 'com_media')
if (str_replace(' ', '', $file['name']) != $file['name'] || $file['name'] !== JFile::makeSafe($file['name']))
{
- $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILENAME'), 'notice');
+ $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILENAME'), 'error');
return false;
}
@@ -82,7 +82,7 @@ public function canUpload($file, $component = 'com_media')
if (count($filetypes) < 2)
{
// There seems to be no extension
- $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'notice');
+ $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'error');
return false;
}
@@ -99,7 +99,7 @@ public function canUpload($file, $component = 'com_media')
if (!empty($check))
{
- $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'notice');
+ $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'error');
return false;
}
@@ -110,7 +110,7 @@ public function canUpload($file, $component = 'com_media')
if ($filetype == '' || $filetype == false || (!in_array($filetype, $allowable) && !in_array($filetype, $ignored)))
{
- $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'notice');
+ $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'error');
return false;
}
@@ -119,7 +119,7 @@ public function canUpload($file, $component = 'com_media')
if ($maxSize > 0 && (int) $file['size'] > $maxSize)
{
- $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETOOLARGE'), 'notice');
+ $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETOOLARGE'), 'error');
return false;
}
@@ -136,14 +136,14 @@ public function canUpload($file, $component = 'com_media')
{
if (($imginfo = getimagesize($file['tmp_name'])) === false)
{
- $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_IMG'), 'notice');
+ $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_IMG'), 'error');
return false;
}
}
else
{
- $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETOOLARGE'), 'notice');
+ $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETOOLARGE'), 'error');
return false;
}
@@ -162,7 +162,7 @@ public function canUpload($file, $component = 'com_media')
if (strlen($type) && !in_array($type, $allowed_mime) && in_array($type, $illegal_mime))
{
- $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'notice');
+ $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'error');
return false;
}
@@ -176,14 +176,14 @@ public function canUpload($file, $component = 'com_media')
if (strlen($type) && !in_array($type, $allowed_mime) && in_array($type, $illegal_mime))
{
- $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'notice');
+ $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'error');
return false;
}
}
elseif (!JFactory::getUser()->authorise('core.manage', $component))
{
- $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNNOTADMIN'), 'notice');
+ $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNNOTADMIN'), 'error');
return false;
}
@@ -208,7 +208,7 @@ public function canUpload($file, $component = 'com_media')
// A tag is ''
if (stristr($xss_check, '<' . $tag . ' ') || stristr($xss_check, '<' . $tag . '>'))
{
- $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNIEXSS'), 'notice');
+ $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNIEXSS'), 'error');
return false;
}
diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
index 502e9a416929f..55d193487f185 100644
--- a/libraries/cms/html/behavior.php
+++ b/libraries/cms/html/behavior.php
@@ -971,7 +971,7 @@ public static function tabstate()
* Add javascript polyfills.
*
* @param string|array $polyfillTypes The polyfill type(s). Examples: event, array('event', 'classlist').
- * @param string $conditionalBrowser A IE conditional expression. Example: lt IE 9 (lower than IE 9).
+ * @param string $conditionalBrowser An IE conditional expression. Example: lt IE 9 (lower than IE 9).
*
* @return void
*
diff --git a/libraries/cms/html/email.php b/libraries/cms/html/email.php
index f31f5c524573f..12bfa1be8fc69 100644
--- a/libraries/cms/html/email.php
+++ b/libraries/cms/html/email.php
@@ -48,7 +48,7 @@ public static function cloak($mail, $mailto = true, $text = '', $email = true)
$mail = static::convertEncoding($mail);
// Random hash
- $rand = md5($mail . rand(1, 100000));
+ $rand = md5($mail . mt_rand(1, 100000));
// Split email by @ symbol
$mail = explode('@', $mail);
diff --git a/libraries/cms/html/html.php b/libraries/cms/html/html.php
index ecb7d1a0447d7..ee7733fa8dc7b 100644
--- a/libraries/cms/html/html.php
+++ b/libraries/cms/html/html.php
@@ -116,7 +116,7 @@ public static function _($key)
throw new InvalidArgumentException(sprintf('%s %s not found.', $prefix, $file), 500);
}
- require_once $path;
+ JLoader::register($className, $path);
if (!class_exists($className))
{
@@ -707,34 +707,31 @@ public static function script($file, $options = array(), $attribs = array())
// If only path is required
if ($options['pathOnly'])
{
- if (count($includes) == 0)
+ if (count($includes) === 0)
{
return;
}
- elseif (count($includes) == 1)
+
+ if (count($includes) === 1)
{
return $includes[0];
}
- else
- {
- return $includes;
- }
+
+ return $includes;
}
+
// If inclusion is required
- else
- {
- $document = JFactory::getDocument();
+ $document = JFactory::getDocument();
- foreach ($includes as $include)
+ foreach ($includes as $include)
+ {
+ // If there is already a version hash in the script reference (by using deprecated MD5SUM).
+ if ($pos = strpos($include, '?') !== false)
{
- // If there is already a version hash in the script reference (by using deprecated MD5SUM).
- if ($pos = strpos($include, '?') !== false)
- {
- $options['version'] = substr($include, $pos + 1);
- }
-
- $document->addScript($include, $options, $attribs);
+ $options['version'] = substr($include, $pos + 1);
}
+
+ $document->addScript($include, $options, $attribs);
}
}
diff --git a/libraries/cms/installer/adapter.php b/libraries/cms/installer/adapter.php
index 597ba4082fe8f..7e83278af8ad0 100644
--- a/libraries/cms/installer/adapter.php
+++ b/libraries/cms/installer/adapter.php
@@ -912,14 +912,10 @@ protected function setupScriptfile()
{
$manifestScriptFile = $this->parent->getPath('source') . '/' . $manifestScript;
- if (is_file($manifestScriptFile))
- {
- // Load the file
- include_once $manifestScriptFile;
- }
-
$classname = $this->getScriptClassName();
+ JLoader::register($classname, $manifestScriptFile);
+
if (class_exists($classname))
{
// Create a new instance
diff --git a/libraries/cms/installer/adapter/file.php b/libraries/cms/installer/adapter/file.php
index f87c811156c24..545e122fe2bdd 100644
--- a/libraries/cms/installer/adapter/file.php
+++ b/libraries/cms/installer/adapter/file.php
@@ -341,15 +341,11 @@ public function uninstall($id)
{
$manifestScriptFile = $this->parent->getPath('extension_root') . '/' . $manifestScript;
- if (is_file($manifestScriptFile))
- {
- // Load the file
- include_once $manifestScriptFile;
- }
-
// Set the class name
$classname = $row->element . 'InstallerScript';
+ JLoader::register($classname, $manifestScriptFile);
+
if (class_exists($classname))
{
// Create a new instance
diff --git a/libraries/cms/installer/adapter/language.php b/libraries/cms/installer/adapter/language.php
index bc4d5711ce5d8..b719ef4ce5404 100644
--- a/libraries/cms/installer/adapter/language.php
+++ b/libraries/cms/installer/adapter/language.php
@@ -306,33 +306,43 @@ protected function _install($cname, $basePath, $clientId, &$element)
// Load the site language manifest.
$siteLanguageManifest = JLanguage::parseXMLLanguageFile(JPATH_SITE . '/language/' . $this->tag . '/' . $this->tag . '.xml');
- // Set the content language title as name in site xx-XX.ini.
+ // Set the content language title as the language metadata name.
$contentLanguageTitle = $siteLanguageManifest['name'];
- // Set the content language as installation native title language variable, fallback to content language title.
+ // Set, as fallback, the content language native title to the language metadata name.
$contentLanguageNativeTitle = $contentLanguageTitle;
- if (file_exists(JPATH_INSTALLATION . '/language/' . $this->tag . '/' . $this->tag . '.xml'))
+ // If exist, load the native title from the language xml metadata.
+ if (isset($siteLanguageMetadata['nativeName']) && $siteLanguageMetadata['nativeName'])
{
- $installationLanguage = new JLanguage($this->tag);
- $installationLanguage->load('', JPATH_INSTALLATION);
+ $contentLanguageNativeTitle = $siteLanguageMetadata['nativeName'];
+ }
- if ($installationLanguage->hasKey('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME'))
+ // Try to load a language string from the installation language var. Will be removed in 4.0.
+ if ($contentLanguageNativeTitle === $contentLanguageTitle)
+ {
+ if (file_exists(JPATH_INSTALLATION . '/language/' . $this->tag . '/' . $this->tag . '.xml'))
{
- // Make sure it will not use the en-GB fallback.
- $defaultLanguage = new JLanguage('en-GB');
- $defaultLanguage->load('', JPATH_INSTALLATION);
-
- $defaultLanguageNativeTitle = $defaultLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME');
- $installationLanguageNativeTitle = $installationLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME');
+ $installationLanguage = new JLanguage($this->tag);
+ $installationLanguage->load('', JPATH_INSTALLATION);
- if ($defaultLanguageNativeTitle != $installationLanguageNativeTitle)
+ if ($installationLanguage->hasKey('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME'))
{
- $contentLanguageNativeTitle = $installationLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME');
+ // Make sure it will not use the en-GB fallback.
+ $defaultLanguage = new JLanguage('en-GB');
+ $defaultLanguage->load('', JPATH_INSTALLATION);
+
+ $defaultLanguageNativeTitle = $defaultLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME');
+ $installationLanguageNativeTitle = $installationLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME');
+
+ if ($defaultLanguageNativeTitle != $installationLanguageNativeTitle)
+ {
+ $contentLanguageNativeTitle = $installationLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME');
+ }
}
}
}
-
+
// Prepare language data for store.
$languageData = array(
'lang_id' => 0,
@@ -660,8 +670,7 @@ public function uninstall($eid)
foreach ($users as $user)
{
- $registry = new Registry;
- $registry->loadString($user->params);
+ $registry = new Registry($user->params);
if ($registry->get($param_name) == $element)
{
diff --git a/libraries/cms/installer/adapter/module.php b/libraries/cms/installer/adapter/module.php
index ecf8a08f9b9bb..3b428fdfe7d55 100644
--- a/libraries/cms/installer/adapter/module.php
+++ b/libraries/cms/installer/adapter/module.php
@@ -569,15 +569,11 @@ public function uninstall($id)
{
$manifestScriptFile = $this->parent->getPath('extension_root') . '/' . $manifestScript;
- if (is_file($manifestScriptFile))
- {
- // Load the file
- include_once $manifestScriptFile;
- }
-
// Set the class name
$classname = $element . 'InstallerScript';
+ JLoader::register($classname, $manifestScriptFile);
+
if (class_exists($classname))
{
// Create a new instance
diff --git a/libraries/cms/installer/adapter/package.php b/libraries/cms/installer/adapter/package.php
index fbb83761fe0f1..54a3d917d8383 100644
--- a/libraries/cms/installer/adapter/package.php
+++ b/libraries/cms/installer/adapter/package.php
@@ -523,15 +523,11 @@ public function uninstall($id)
{
$manifestScriptFile = $this->parent->getPath('extension_root') . '/' . $manifestScript;
- if (is_file($manifestScriptFile))
- {
- // Load the file
- include_once $manifestScriptFile;
- }
-
// Set the class name
$classname = $row->element . 'InstallerScript';
+ JLoader::register($classname, $manifestScriptFile);
+
if (class_exists($classname))
{
// Create a new instance
diff --git a/libraries/cms/installer/adapter/plugin.php b/libraries/cms/installer/adapter/plugin.php
index 1865100ade9da..1bca17deef825 100644
--- a/libraries/cms/installer/adapter/plugin.php
+++ b/libraries/cms/installer/adapter/plugin.php
@@ -515,17 +515,14 @@ public function uninstall($id)
{
$manifestScriptFile = $this->parent->getPath('source') . '/' . $manifestScript;
- if (is_file($manifestScriptFile))
- {
- // Load the file
- include_once $manifestScriptFile;
- }
// If a dash is present in the folder, remove it
$folderClass = str_replace('-', '', $row->folder);
// Set the class name
$classname = 'Plg' . $folderClass . $row->element . 'InstallerScript';
+ JLoader::register($classname, $manifestScriptFile);
+
if (class_exists($classname))
{
// Create a new instance
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
index 30f53423dc723..3d393be9e76a1 100644
--- a/libraries/cms/installer/installer.php
+++ b/libraries/cms/installer/installer.php
@@ -2289,7 +2289,7 @@ public function getAdapters($options = array(), array $custom = array())
if (!class_exists($class))
{
// Try to load the adapter object
- require_once $this->_basepath . '/' . $this->_adapterfolder . '/' . $fileName;
+ JLoader::register($class, $this->_basepath . '/' . $this->_adapterfolder . '/' . $fileName);
if (!class_exists($class))
{
@@ -2350,7 +2350,7 @@ public function loadAdapter($adapter, $options = array())
}
// Try once more to find the class
- require_once $path;
+ JLoader::register($class, $path);
if (!class_exists($class))
{
diff --git a/libraries/cms/layout/file.php b/libraries/cms/layout/file.php
index 88969a764ff57..7a7c0ea656f67 100644
--- a/libraries/cms/layout/file.php
+++ b/libraries/cms/layout/file.php
@@ -640,7 +640,7 @@ public function setSuffixes(array $suffixes)
/**
* Render a layout with the same include paths & options
*
- * @param object $layoutId Object which properties are used inside the layout file to build displayed output
+ * @param string $layoutId The identifier for the sublayout to be searched in a subfolder with the name of the current layout
* @param mixed $displayData Data to be rendered
*
* @return string The necessary HTML to display the layout
diff --git a/libraries/cms/library/helper.php b/libraries/cms/library/helper.php
index 65fb44582223f..ae389ce9b387d 100644
--- a/libraries/cms/library/helper.php
+++ b/libraries/cms/library/helper.php
@@ -175,9 +175,7 @@ protected static function _load($element)
// Convert the params to an object.
if (is_string(static::$libraries[$element]->params))
{
- $temp = new Registry;
- $temp->loadString(static::$libraries[$element]->params);
- static::$libraries[$element]->params = $temp;
+ static::$libraries[$element]->params = new Registry(static::$libraries[$element]->params);
}
return true;
diff --git a/libraries/cms/menu/menu.php b/libraries/cms/menu/menu.php
index cdade25890ab4..f302b72f6769e 100644
--- a/libraries/cms/menu/menu.php
+++ b/libraries/cms/menu/menu.php
@@ -83,9 +83,7 @@ public function __construct($options = array())
// Decode the item params
try
{
- $result = new Registry;
- $result->loadString($item->params);
- $item->params = $result;
+ $item->params = new Registry($item->params);
}
catch (RuntimeException $e)
{
@@ -129,10 +127,11 @@ public static function getInstance($client, $options = array())
{
$path = $info->path . '/includes/menu.php';
- if (file_exists($path))
+ JLoader::register($classname, $path);
+
+ if (class_exists($classname))
{
JLog::add('Non-autoloadable JMenu subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated');
- include_once $path;
}
}
}
diff --git a/libraries/cms/module/helper.php b/libraries/cms/module/helper.php
index cae0e273bd223..7ba5884bff0dd 100644
--- a/libraries/cms/module/helper.php
+++ b/libraries/cms/module/helper.php
@@ -166,8 +166,7 @@ public static function renderModule($module, $attribs = array())
$app->scope = $module->module;
// Get module parameters
- $params = new Registry;
- $params->loadString($module->params);
+ $params = new Registry($module->params);
// Get the template
$template = $app->getTemplate();
diff --git a/libraries/cms/pathway/pathway.php b/libraries/cms/pathway/pathway.php
index 2379da7b5999b..d1497b4bbcb22 100644
--- a/libraries/cms/pathway/pathway.php
+++ b/libraries/cms/pathway/pathway.php
@@ -79,10 +79,11 @@ public static function getInstance($client, $options = array())
{
$path = $info->path . '/includes/pathway.php';
- if (file_exists($path))
+ JLoader::register($classname, $path);
+
+ if (class_exists($classname))
{
JLog::add('Non-autoloadable JPathway subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated');
- include_once $path;
}
}
}
diff --git a/libraries/cms/plugin/plugin.php b/libraries/cms/plugin/plugin.php
index 16e6c83d62da2..ee8436ae33f55 100644
--- a/libraries/cms/plugin/plugin.php
+++ b/libraries/cms/plugin/plugin.php
@@ -71,8 +71,7 @@ public function __construct(&$subject, $config = array())
}
else
{
- $this->params = new Registry;
- $this->params->loadString($config['params']);
+ $this->params = new Registry($config['params']);
}
}
diff --git a/libraries/cms/router/router.php b/libraries/cms/router/router.php
index dadb29b07b1ce..c8b20f4801069 100644
--- a/libraries/cms/router/router.php
+++ b/libraries/cms/router/router.php
@@ -184,10 +184,11 @@ public static function getInstance($client, $options = array())
{
$path = $info->path . '/includes/router.php';
- if (file_exists($path))
+ JLoader::register($classname, $path);
+
+ if (class_exists($classname))
{
JLog::add('Non-autoloadable JRouter subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated');
- include_once $path;
}
}
}
diff --git a/libraries/cms/router/site.php b/libraries/cms/router/site.php
index 07dd5d491806b..208c1fd4cb5d7 100644
--- a/libraries/cms/router/site.php
+++ b/libraries/cms/router/site.php
@@ -731,14 +731,8 @@ public function getComponentRouter($component)
if (!class_exists($class))
{
- // Use the component routing handler if it exists
- $path = JPATH_SITE . '/components/' . $component . '/router.php';
-
- // Use the custom routing handler if it exists
- if (file_exists($path))
- {
- require_once $path;
- }
+ // Add the custom routing handler to the autoloader if it exists
+ JLoader::register($class, JPATH_SITE . '/components/' . $component . '/router.php');
}
if (class_exists($class))
diff --git a/libraries/cms/table/corecontent.php b/libraries/cms/table/corecontent.php
index 2fa07bc7ff3a5..42e3aed45d4ec 100644
--- a/libraries/cms/table/corecontent.php
+++ b/libraries/cms/table/corecontent.php
@@ -48,36 +48,31 @@ public function bind($array, $ignore = '')
{
if (isset($array['core_params']) && is_array($array['core_params']))
{
- $registry = new Registry;
- $registry->loadArray($array['core_params']);
+ $registry = new Registry($array['core_params']);
$array['core_params'] = (string) $registry;
}
if (isset($array['core_metadata']) && is_array($array['core_metadata']))
{
- $registry = new Registry;
- $registry->loadArray($array['core_metadata']);
+ $registry = new Registry($array['core_metadata']);
$array['core_metadata'] = (string) $registry;
}
if (isset($array['core_images']) && is_array($array['core_images']))
{
- $registry = new Registry;
- $registry->loadArray($array['core_images']);
+ $registry = new Registry($array['core_images']);
$array['core_images'] = (string) $registry;
}
if (isset($array['core_urls']) && is_array($array['core_urls']))
{
- $registry = new Registry;
- $registry->loadArray($array['core_urls']);
+ $registry = new Registry($array['core_urls']);
$array['core_urls'] = (string) $registry;
}
if (isset($array['core_body']) && is_array($array['core_body']))
{
- $registry = new Registry;
- $registry->loadArray($array['core_body']);
+ $registry = new Registry($array['core_body']);
$array['core_body'] = (string) $registry;
}
diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
index 6613294dcd3e8..8f10f3d737d52 100644
--- a/libraries/cms/version/version.php
+++ b/libraries/cms/version/version.php
@@ -70,7 +70,7 @@ final class JVersion
* @var string
* @since 3.5
*/
- const RELDATE = '27-June-2016';
+ const RELDATE = '18-October-2016';
/**
* Release time.
@@ -78,7 +78,7 @@ final class JVersion
* @var string
* @since 3.5
*/
- const RELTIME = '08:13';
+ const RELTIME = '16:37';
/**
* Release timezone.
diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index 33fb7e2d4e204..61f55668973f0 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -1071,7 +1071,7 @@ public function afterSessionStart()
if ($session->isNew())
{
- $session->set('registry', new Registry('session'));
+ $session->set('registry', new Registry);
$session->set('user', new JUser);
}
}
diff --git a/libraries/joomla/base/adapter.php b/libraries/joomla/base/adapter.php
index 5d6552c04f21f..eb6861f16fcbf 100644
--- a/libraries/joomla/base/adapter.php
+++ b/libraries/joomla/base/adapter.php
@@ -138,10 +138,10 @@ public function setAdapter($name, &$adapter = null, $options = array())
}
// Try to load the adapter object
- require_once $fullpath;
-
$class = $this->_classprefix . ucfirst($name);
+ JLoader::register($class, $fullpath);
+
if (!class_exists($class))
{
return false;
diff --git a/libraries/joomla/cache/controller.php b/libraries/joomla/cache/controller.php
index 839eef17c55c9..7f6842e0327df 100644
--- a/libraries/joomla/cache/controller.php
+++ b/libraries/joomla/cache/controller.php
@@ -102,7 +102,7 @@ public static function getInstance($type = 'output', $options = array())
throw new RuntimeException('Unable to load Cache Controller: ' . $type, 500);
}
- include_once $path;
+ JLoader::register($class, $path);
// The class should now be loaded
if (!class_exists($class))
diff --git a/libraries/joomla/cache/storage.php b/libraries/joomla/cache/storage.php
index d7cc91c12e78e..eed2ae10a0bed 100644
--- a/libraries/joomla/cache/storage.php
+++ b/libraries/joomla/cache/storage.php
@@ -158,7 +158,7 @@ public static function getInstance($handler = null, $options = array())
throw new JCacheExceptionUnsupported(sprintf('Unable to load Cache Storage: %s', $handler));
}
- include_once $path;
+ JLoader::register($class, $path);
// The class should now be loaded
if (!class_exists($class))
diff --git a/libraries/joomla/date/date.php b/libraries/joomla/date/date.php
index 2aa920ca1e9ba..028ea77bf47b3 100644
--- a/libraries/joomla/date/date.php
+++ b/libraries/joomla/date/date.php
@@ -28,7 +28,7 @@
* @property-read string $microsecond u - Microseconds with leading zeros.
* @property-read string $month m - Numeric representation of a month, with leading zeros.
* @property-read string $ordinal S - English ordinal suffix for the day of the month, 2 characters.
- * @property-read string $week W - Numeric representation of the day of the week.
+ * @property-read string $week W - ISO-8601 week number of year, weeks starting on Monday.
* @property-read string $year Y - A full numeric representation of a year, 4 digits.
*
* @since 11.1
diff --git a/libraries/joomla/document/document.php b/libraries/joomla/document/document.php
index 3703d05fac356..501dc24019942 100644
--- a/libraries/joomla/document/document.php
+++ b/libraries/joomla/document/document.php
@@ -292,10 +292,11 @@ public static function getInstance($type = 'html', $attributes = array())
// @deprecated 4.0 - JDocument objects should be autoloaded instead
$path = __DIR__ . '/' . $type . '/' . $type . '.php';
- if (file_exists($path))
+ JLoader::register($class, $path);
+
+ if (class_exists($class))
{
JLog::add('Non-autoloadable JDocument subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated');
- require_once $path;
}
// Default to the raw format
else
@@ -486,6 +487,12 @@ public function addScript($url, $options = array(), $attribs = array())
}
}
+ // Default value for type.
+ if (!isset($attribs['type']) && !isset($attribs['mime']))
+ {
+ $attribs['type'] = 'text/javascript';
+ }
+
$this->_scripts[$url] = isset($this->_scripts[$url]) ? array_replace($this->_scripts[$url], $attribs) : $attribs;
$this->_scripts[$url]['options'] = isset($this->_scripts[$url]['options']) ? array_replace($this->_scripts[$url]['options'], $options) : $options;
@@ -1118,8 +1125,9 @@ public function loadRenderer($type)
throw new RuntimeException('Unable to load renderer class', 500);
}
+ JLoader::register($class, $path);
+
JLog::add('Non-autoloadable JDocumentRenderer subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated');
- require_once $path;
// If the class still doesn't exist after including the path, we've got issues
if (!class_exists($class))
diff --git a/libraries/joomla/document/html.php b/libraries/joomla/document/html.php
index 0a3103b3b6a3c..2653a0626f14c 100644
--- a/libraries/joomla/document/html.php
+++ b/libraries/joomla/document/html.php
@@ -97,6 +97,8 @@ class JDocumentHtml extends JDocument
*
* @var boolean
* @since 12.1
+ *
+ * @note 4.0 Will be replaced by $html5 and the default value will be true.
*/
private $_html5 = null;
@@ -219,7 +221,7 @@ public function mergeHeadData($data)
}
$this->_links = (isset($data['links']) && !empty($data['links']) && is_array($data['links']))
- ? array_unique(array_merge($this->_links, $data['links']))
+ ? array_unique(array_merge($this->_links, $data['links']), SORT_REGULAR)
: $this->_links;
$this->_styleSheets = (isset($data['styleSheets']) && !empty($data['styleSheets']) && is_array($data['styleSheets']))
? array_merge($this->_styleSheets, $data['styleSheets'])
diff --git a/libraries/joomla/form/helper.php b/libraries/joomla/form/helper.php
index ef0402ebb5ddd..45c267e0b309a 100644
--- a/libraries/joomla/form/helper.php
+++ b/libraries/joomla/form/helper.php
@@ -206,12 +206,13 @@ protected static function loadClass($entity, $type)
foreach ($paths as $path)
{
$file = JPath::find($path, $type);
+
if (!$file)
{
continue;
}
- require_once $file;
+ JLoader::register($class, $file);
if (class_exists($class))
{
diff --git a/libraries/joomla/form/rule/number.php b/libraries/joomla/form/rule/number.php
index 59a563de12d49..a384d65430d0b 100644
--- a/libraries/joomla/form/rule/number.php
+++ b/libraries/joomla/form/rule/number.php
@@ -9,12 +9,12 @@
defined('JPATH_PLATFORM') or die;
+use Joomla\Registry\Registry;
+
/**
* Form Rule class for the Joomla Platform.
*
- * @package Joomla.Platform
- * @subpackage Form
- * @since 3.5
+ * @since 3.5
*/
class JFormRuleNumber extends JFormRule
{
@@ -26,14 +26,14 @@ class JFormRuleNumber extends JFormRule
* @param string $group The field name group control value. This acts as as an array container for the field.
* For example if the field has name="foo" and the group value is set to "bar" then the
* full field name would end up being "bar[foo]".
- * @param JRegistry $input An optional JRegistry object with the entire data set to validate against the entire form.
+ * @param Registry $input An optional Registry object with the entire data set to validate against the entire form.
* @param JForm $form The form object for which the field is being tested.
*
* @return boolean True if the value is valid, false otherwise.
*
* @since 3.5
*/
- public function test(SimpleXMLElement $element, $value, $group = null, JRegistry $input = null, JForm $form = null)
+ public function test(SimpleXMLElement $element, $value, $group = null, Registry $input = null, JForm $form = null)
{
$float_value = (float) $value;
diff --git a/libraries/joomla/language/language.php b/libraries/joomla/language/language.php
index ca5668cb41e04..948594a2ff6dc 100644
--- a/libraries/joomla/language/language.php
+++ b/libraries/joomla/language/language.php
@@ -233,10 +233,7 @@ public function __construct($lang = null, $debug = false)
while (!class_exists($class) && $path)
{
- if (file_exists($path))
- {
- require_once $path;
- }
+ JLoader::register($class, $path);
$path = next($paths);
}
diff --git a/libraries/joomla/session/handler/native.php b/libraries/joomla/session/handler/native.php
index bc13c8ab327f9..c339a6f1ae5a4 100644
--- a/libraries/joomla/session/handler/native.php
+++ b/libraries/joomla/session/handler/native.php
@@ -187,7 +187,7 @@ public function save()
$session = JFactory::getSession();
$data = $session->getData();
- // Before storing it, let's serialize and encode the JRegistry object
+ // Before storing it, let's serialize and encode the Registry object
$_SESSION['joomla'] = base64_encode(serialize($data));
session_write_close();
diff --git a/libraries/joomla/session/storage.php b/libraries/joomla/session/storage.php
index 00f98a0c2cf34..76c6a01dd9989 100644
--- a/libraries/joomla/session/storage.php
+++ b/libraries/joomla/session/storage.php
@@ -65,7 +65,7 @@ public static function getInstance($name = 'none', $options = array())
throw new JSessionExceptionUnsupported('Unable to load session storage class: ' . $name);
}
- require_once $path;
+ JLoader::register($class, $path);
// The class should now be loaded
if (!class_exists($class))
diff --git a/libraries/joomla/table/extension.php b/libraries/joomla/table/extension.php
index f349ee42ca5bb..e901b3f2d0c83 100644
--- a/libraries/joomla/table/extension.php
+++ b/libraries/joomla/table/extension.php
@@ -68,15 +68,13 @@ public function bind($array, $ignore = '')
{
if (isset($array['params']) && is_array($array['params']))
{
- $registry = new Registry;
- $registry->loadArray($array['params']);
+ $registry = new Registry($array['params']);
$array['params'] = (string) $registry;
}
if (isset($array['control']) && is_array($array['control']))
{
- $registry = new Registry;
- $registry->loadArray($array['control']);
+ $registry = new Registry($array['control']);
$array['control'] = (string) $registry;
}
diff --git a/libraries/joomla/table/language.php b/libraries/joomla/table/language.php
index 3ff2b2ed97db2..b654208df1aae 100644
--- a/libraries/joomla/table/language.php
+++ b/libraries/joomla/table/language.php
@@ -69,7 +69,7 @@ public function store($updateNulls = false)
}
// Verify that the image field is unique
- if ($table->load(array('image' => $this->image)) && ($table->lang_id != $this->lang_id || $this->lang_id == 0))
+ if ($this->image && $table->load(array('image' => $this->image)) && ($table->lang_id != $this->lang_id || $this->lang_id == 0))
{
$this->setError(JText::_('JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_IMAGE'));
diff --git a/libraries/joomla/table/table.php b/libraries/joomla/table/table.php
index 89976df78fb06..2562bbb304f7d 100644
--- a/libraries/joomla/table/table.php
+++ b/libraries/joomla/table/table.php
@@ -286,7 +286,7 @@ public static function getInstance($type, $prefix = 'JTable', $config = array())
if ($tryThis = JPath::find($paths[$pathIndex++], strtolower($type) . '.php'))
{
// Import the class file.
- include_once $tryThis;
+ JLoader::register($tableClass, $tryThis);
}
}
diff --git a/libraries/joomla/table/update.php b/libraries/joomla/table/update.php
index 05a42a7dfb8db..e7052b6ade14a 100644
--- a/libraries/joomla/table/update.php
+++ b/libraries/joomla/table/update.php
@@ -68,15 +68,13 @@ public function bind($array, $ignore = '')
{
if (isset($array['params']) && is_array($array['params']))
{
- $registry = new Registry;
- $registry->loadArray($array['params']);
+ $registry = new Registry($array['params']);
$array['params'] = (string) $registry;
}
if (isset($array['control']) && is_array($array['control']))
{
- $registry = new Registry;
- $registry->loadArray($array['control']);
+ $registry = new Registry($array['control']);
$array['control'] = (string) $registry;
}
diff --git a/libraries/joomla/table/user.php b/libraries/joomla/table/user.php
index 2348c535d64ee..b4fd4c30a0897 100644
--- a/libraries/joomla/table/user.php
+++ b/libraries/joomla/table/user.php
@@ -127,8 +127,7 @@ public function bind($array, $ignore = '')
{
if (array_key_exists('params', $array) && is_array($array['params']))
{
- $registry = new Registry;
- $registry->loadArray($array['params']);
+ $registry = new Registry($array['params']);
$array['params'] = (string) $registry;
}
diff --git a/libraries/joomla/updater/adapters/extension.php b/libraries/joomla/updater/adapters/extension.php
index 6d4a0fe187222..2c5e1b65e132c 100644
--- a/libraries/joomla/updater/adapters/extension.php
+++ b/libraries/joomla/updater/adapters/extension.php
@@ -70,6 +70,11 @@ protected function _startElement($parser, $name, $attrs = array())
{
$this->currentUpdate->php_minimum = '';
}
+
+ if ($name == 'SUPPORTED_DATABASES')
+ {
+ $this->currentUpdate->supported_databases = $attrs;
+ }
break;
}
}
@@ -137,6 +142,56 @@ protected function _endElement($parser, $name)
$phpMatch = false;
}
+ $dbMatch = false;
+
+ // Check if DB & version is supported via tag, assume supported if tag isn't present
+ if (isset($this->currentUpdate->supported_databases))
+ {
+ $db = JFactory::getDbo();
+ $dbType = strtoupper($db->getServerType());
+ $dbVersion = $db->getVersion();
+ $supportedDbs = $this->currentUpdate->supported_databases;
+
+ // Do we have a entry for the database?
+ if (array_key_exists($dbType, $supportedDbs))
+ {
+ $minumumVersion = $supportedDbs[$dbType];
+ $dbMatch = version_compare($dbVersion, $minumumVersion, '>=');
+
+ if (!$dbMatch)
+ {
+ // Notify the user of the potential update
+ $dbMsg = JText::sprintf(
+ 'JLIB_INSTALLER_AVAILABLE_UPDATE_DB_MINIMUM',
+ $this->currentUpdate->name,
+ $this->currentUpdate->version,
+ JText::_($db->name),
+ $dbVersion,
+ $minumumVersion
+ );
+
+ JFactory::getApplication()->enqueueMessage($dbMsg, 'warning');
+ }
+ }
+ else
+ {
+ // Notify the user of the potential update
+ $dbMsg = JText::sprintf(
+ 'JLIB_INSTALLER_AVAILABLE_UPDATE_DB_TYPE',
+ $this->currentUpdate->name,
+ $this->currentUpdate->version,
+ JText::_($db->name)
+ );
+
+ JFactory::getApplication()->enqueueMessage($dbMsg, 'warning');
+ }
+ }
+ else
+ {
+ // Set to true if the tag is not set
+ $dbMatch = true;
+ }
+
// Check minimum stability
$stabilityMatch = true;
@@ -153,13 +208,18 @@ protected function _endElement($parser, $name)
unset($this->currentUpdate->php_minimum);
}
+ if (isset($this->currentUpdate->supported_databases))
+ {
+ unset($this->currentUpdate->supported_databases);
+ }
+
if (isset($this->currentUpdate->stability))
{
unset($this->currentUpdate->stability);
}
// If the PHP version and minimum stability checks pass, consider this version as a possible update
- if ($phpMatch && $stabilityMatch)
+ if ($phpMatch && $stabilityMatch && $dbMatch)
{
if (isset($this->latest))
{
diff --git a/libraries/joomla/updater/update.php b/libraries/joomla/updater/update.php
index e8053c60002ef..09568038b78e5 100644
--- a/libraries/joomla/updater/update.php
+++ b/libraries/joomla/updater/update.php
@@ -321,14 +321,35 @@ public function _endElement($parser, $name)
&& ((!isset($this->currentUpdate->targetplatform->min_dev_level)) || JVersion::DEV_LEVEL >= $this->currentUpdate->targetplatform->min_dev_level)
&& ((!isset($this->currentUpdate->targetplatform->max_dev_level)) || JVersion::DEV_LEVEL <= $this->currentUpdate->targetplatform->max_dev_level))
{
+ $phpMatch = false;
+
// Check if PHP version supported via tag, assume true if tag isn't present
if (!isset($this->currentUpdate->php_minimum) || version_compare(PHP_VERSION, $this->currentUpdate->php_minimum->_data, '>='))
{
$phpMatch = true;
}
+
+ $dbMatch = false;
+
+ // Check if DB & version is supported via tag, assume supported if tag isn't present
+ if (isset($this->currentUpdate->supported_databases))
+ {
+ $db = JFactory::getDbo();
+ $dbType = strtolower($db->getServerType());
+ $dbVersion = $db->getVersion();
+ $supportedDbs = $this->currentUpdate->supported_databases;
+
+ // Do we have a entry for the database?
+ if (isset($supportedDbs->$dbType))
+ {
+ $minumumVersion = $supportedDbs->$dbType;
+ $dbMatch = version_compare($dbVersion, $minumumVersion, '>=');
+ }
+ }
else
{
- $phpMatch = false;
+ // Set to true if the tag is not set
+ $dbMatch = true;
}
// Check minimum stability
@@ -339,7 +360,7 @@ public function _endElement($parser, $name)
$stabilityMatch = false;
}
- if ($phpMatch && $stabilityMatch)
+ if ($phpMatch && $stabilityMatch && $dbMatch)
{
if (isset($this->latest))
{
diff --git a/libraries/joomla/user/helper.php b/libraries/joomla/user/helper.php
index c03e924c8d101..4362849b2c147 100644
--- a/libraries/joomla/user/helper.php
+++ b/libraries/joomla/user/helper.php
@@ -612,7 +612,7 @@ public static function getSalt($encryption = 'md5-hex', $seed = '', $plaintext =
for ($i = 0; $i < 8; $i++)
{
- $salt .= $APRMD5{rand(0, 63)};
+ $salt .= $APRMD5{mt_rand(0, 63)};
}
return $salt;
diff --git a/libraries/joomla/user/user.php b/libraries/joomla/user/user.php
index e06f48b6d9c33..ab9d26b46241e 100644
--- a/libraries/joomla/user/user.php
+++ b/libraries/joomla/user/user.php
@@ -798,8 +798,7 @@ public function save($updateOnly = false)
if ($my->id == $table->id)
{
- $registry = new Registry;
- $registry->loadString($table->params);
+ $registry = new Registry($table->params);
$my->setParameters($registry);
}
diff --git a/libraries/joomla/utilities/utility.php b/libraries/joomla/utilities/utility.php
index 69c8cb5334b01..cd8ca948158be 100644
--- a/libraries/joomla/utilities/utility.php
+++ b/libraries/joomla/utilities/utility.php
@@ -45,4 +45,37 @@ public static function parseAttributes($string)
return $retarray;
}
+
+ /**
+ * Method to get the maximum allowed file size for the HTTP uploads based on the active PHP configuration
+ *
+ * @param mixed $custom A custom upper limit, if the PHP settings are all above this then this will be used
+ *
+ * @return int Size in number of bytes
+ *
+ * @since __DEPLOY_VERSION__
+ */
+ public static function getMaxUploadSize($custom = null)
+ {
+ if ($custom)
+ {
+ $custom = JHtml::_('number.bytes', $custom, '');
+
+ if ($custom > 0)
+ {
+ $sizes[] = $custom;
+ }
+ }
+
+ /*
+ * Read INI settings which affects upload size limits
+ * and Convert each into number of bytes so that we can compare
+ */
+ $sizes[] = JHtml::_('number.bytes', ini_get('memory_limit'), '');
+ $sizes[] = JHtml::_('number.bytes', ini_get('post_max_size'), '');
+ $sizes[] = JHtml::_('number.bytes', ini_get('upload_max_filesize'), '');
+
+ // The minimum of these is the limiting factor
+ return min($sizes);
+ }
}
diff --git a/libraries/legacy/application/application.php b/libraries/legacy/application/application.php
index 1990c221b80df..402c48dcd66ea 100644
--- a/libraries/legacy/application/application.php
+++ b/libraries/legacy/application/application.php
@@ -1097,7 +1097,7 @@ public function afterSessionStart()
if ($session->isNew())
{
- $session->set('registry', new Registry('session'));
+ $session->set('registry', new Registry);
$session->set('user', new JUser);
}
}
diff --git a/libraries/legacy/categories/categories.php b/libraries/legacy/categories/categories.php
index 19c7d944baf5f..380f73e3930ec 100644
--- a/libraries/legacy/categories/categories.php
+++ b/libraries/legacy/categories/categories.php
@@ -141,11 +141,9 @@ public static function getInstance($extension, $options = array())
{
$path = JPATH_SITE . '/components/' . $component . '/helpers/category.php';
- if (is_file($path))
- {
- include_once $path;
- }
- else
+ JLoader::register($classname, $path);
+
+ if (!class_exists($classname))
{
return false;
}
@@ -918,9 +916,7 @@ public function getParams()
{
if (!($this->params instanceof Registry))
{
- $temp = new Registry;
- $temp->loadString($this->params);
- $this->params = $temp;
+ $this->params = new Registry($this->params);
}
return $this->params;
@@ -937,9 +933,7 @@ public function getMetadata()
{
if (!($this->metadata instanceof Registry))
{
- $temp = new Registry;
- $temp->loadString($this->metadata);
- $this->metadata = $temp;
+ $this->metadata = new Registry($this->metadata);
}
return $this->metadata;
diff --git a/libraries/legacy/controller/legacy.php b/libraries/legacy/controller/legacy.php
index 8270d66c7548b..9b77f4755d798 100644
--- a/libraries/legacy/controller/legacy.php
+++ b/libraries/legacy/controller/legacy.php
@@ -274,18 +274,19 @@ public static function getInstance($prefix, $config = array())
// Include the class if not present.
if (!class_exists($class))
{
- // If the controller file path exists, include it.
- if (file_exists($path))
- {
- require_once $path;
- }
- elseif (isset($backuppath) && file_exists($backuppath))
- {
- require_once $backuppath;
- }
- else
+ JLoader::register($class, $path);
+
+ if (!class_exists($class))
{
- throw new InvalidArgumentException(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER', $type, $format));
+ if (isset($backuppath) && file_exists($backuppath))
+ {
+ JLoader::register($class, $backuppath);
+ }
+
+ if (!class_exists($class))
+ {
+ throw new InvalidArgumentException(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER', $type, $format));
+ }
}
}
@@ -585,7 +586,7 @@ protected function createView($name, $prefix = '', $type = '', $config = array()
return null;
}
- require_once $path;
+ JLoader::register($viewClass, $path);
if (!class_exists($viewClass))
{
diff --git a/libraries/legacy/model/admin.php b/libraries/legacy/model/admin.php
index d2e9c7b2400e5..6772842789c35 100644
--- a/libraries/legacy/model/admin.php
+++ b/libraries/legacy/model/admin.php
@@ -906,8 +906,7 @@ public function getItem($pk = null)
if (property_exists($item, 'params'))
{
- $registry = new Registry;
- $registry->loadString($item->params);
+ $registry = new Registry($item->params);
$item->params = $registry->toArray();
}
diff --git a/libraries/legacy/model/legacy.php b/libraries/legacy/model/legacy.php
index bc93bf4dccb71..c415d20528ed1 100644
--- a/libraries/legacy/model/legacy.php
+++ b/libraries/legacy/model/legacy.php
@@ -191,7 +191,7 @@ public static function getInstance($type, $prefix = '', $config = array())
return false;
}
- require_once $path;
+ JLoader::register($modelClass, $path);
if (!class_exists($modelClass))
{
diff --git a/libraries/legacy/table/category.php b/libraries/legacy/table/category.php
index e3f41fe8721f8..2f815bb90fba3 100644
--- a/libraries/legacy/table/category.php
+++ b/libraries/legacy/table/category.php
@@ -174,15 +174,13 @@ public function bind($array, $ignore = '')
{
if (isset($array['params']) && is_array($array['params']))
{
- $registry = new Registry;
- $registry->loadArray($array['params']);
+ $registry = new Registry($array['params']);
$array['params'] = (string) $registry;
}
if (isset($array['metadata']) && is_array($array['metadata']))
{
- $registry = new Registry;
- $registry->loadArray($array['metadata']);
+ $registry = new Registry($array['metadata']);
$array['metadata'] = (string) $registry;
}
diff --git a/libraries/legacy/table/content.php b/libraries/legacy/table/content.php
index ce5f186c7fb9b..af03f4aa01947 100644
--- a/libraries/legacy/table/content.php
+++ b/libraries/legacy/table/content.php
@@ -142,15 +142,13 @@ public function bind($array, $ignore = '')
if (isset($array['attribs']) && is_array($array['attribs']))
{
- $registry = new Registry;
- $registry->loadArray($array['attribs']);
+ $registry = new Registry($array['attribs']);
$array['attribs'] = (string) $registry;
}
if (isset($array['metadata']) && is_array($array['metadata']))
{
- $registry = new Registry;
- $registry->loadArray($array['metadata']);
+ $registry = new Registry($array['metadata']);
$array['metadata'] = (string) $registry;
}
diff --git a/libraries/legacy/table/menu.php b/libraries/legacy/table/menu.php
index 554a6f794b447..122dc45f6457a 100644
--- a/libraries/legacy/table/menu.php
+++ b/libraries/legacy/table/menu.php
@@ -72,8 +72,7 @@ public function bind($array, $ignore = '')
if (isset($array['params']) && is_array($array['params']))
{
- $registry = new Registry;
- $registry->loadArray($array['params']);
+ $registry = new Registry($array['params']);
$array['params'] = (string) $registry;
}
@@ -204,7 +203,7 @@ public function store($updateNulls = false)
}
}
- // The alias already exists. Enqueue a error message.
+ // The alias already exists. Enqueue an error message.
if ($error)
{
$menuTypeTable = JTable::getInstance('MenuType', 'JTable', array('dbo' => $this->getDbo()));
diff --git a/libraries/legacy/table/module.php b/libraries/legacy/table/module.php
index 13a1d3bb102df..389792f5207e7 100644
--- a/libraries/legacy/table/module.php
+++ b/libraries/legacy/table/module.php
@@ -148,8 +148,7 @@ public function bind($array, $ignore = '')
{
if (isset($array['params']) && is_array($array['params']))
{
- $registry = new Registry;
- $registry->loadArray($array['params']);
+ $registry = new Registry($array['params']);
$array['params'] = (string) $registry;
}
diff --git a/libraries/vendor/composer/ClassLoader.php b/libraries/vendor/composer/ClassLoader.php
index ff6ecfb822f89..ac67d302a1866 100644
--- a/libraries/vendor/composer/ClassLoader.php
+++ b/libraries/vendor/composer/ClassLoader.php
@@ -53,8 +53,8 @@ class ClassLoader
private $useIncludePath = false;
private $classMap = array();
-
private $classMapAuthoritative = false;
+ private $missingClasses = array();
public function getPrefixes()
{
@@ -322,20 +322,20 @@ public function findFile($class)
if (isset($this->classMap[$class])) {
return $this->classMap[$class];
}
- if ($this->classMapAuthoritative) {
+ if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
return false;
}
$file = $this->findFileWithExtension($class, '.php');
// Search for Hack files if we are running on HHVM
- if ($file === null && defined('HHVM_VERSION')) {
+ if (false === $file && defined('HHVM_VERSION')) {
$file = $this->findFileWithExtension($class, '.hh');
}
- if ($file === null) {
+ if (false === $file) {
// Remember that this class does not exist.
- return $this->classMap[$class] = false;
+ $this->missingClasses[$class] = true;
}
return $file;
@@ -399,6 +399,8 @@ private function findFileWithExtension($class, $ext)
if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
return $file;
}
+
+ return false;
}
}
diff --git a/media/editors/codemirror/addon/comment/comment.js b/media/editors/codemirror/addon/comment/comment.js
index 2f2f071df974d..d71cf43603776 100644
--- a/media/editors/codemirror/addon/comment/comment.js
+++ b/media/editors/codemirror/addon/comment/comment.js
@@ -103,6 +103,7 @@
self.lineComment(from, to, options);
return;
}
+ if (/\bcomment\b/.test(self.getTokenTypeAt(Pos(from.line, 0)))) return
var end = Math.min(to.line, self.lastLine());
if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end;
@@ -162,13 +163,15 @@
var endString = options.blockCommentEnd || mode.blockCommentEnd;
if (!startString || !endString) return false;
var lead = options.blockCommentLead || mode.blockCommentLead;
- var startLine = self.getLine(start), endLine = end == start ? startLine : self.getLine(end);
- var open = startLine.indexOf(startString), close = endLine.lastIndexOf(endString);
+ var startLine = self.getLine(start), open = startLine.indexOf(startString)
+ if (open == -1) return false
+ var endLine = end == start ? startLine : self.getLine(end)
+ var close = endLine.indexOf(endString, end == start ? open + startString.length : 0);
if (close == -1 && start != end) {
endLine = self.getLine(--end);
- close = endLine.lastIndexOf(endString);
+ close = endLine.indexOf(endString);
}
- if (open == -1 || close == -1 ||
+ if (close == -1 ||
!/comment/.test(self.getTokenTypeAt(Pos(start, open + 1))) ||
!/comment/.test(self.getTokenTypeAt(Pos(end, close + 1))))
return false;
diff --git a/media/editors/codemirror/addon/comment/comment.min.js b/media/editors/codemirror/addon/comment/comment.min.js
index 8f1bffcddf91a..5e906b35ebd37 100644
--- a/media/editors/codemirror/addon/comment/comment.min.js
+++ b/media/editors/codemirror/addon/comment/comment.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";function b(a){var b=a.search(e);return-1==b?0:b}function c(a,b,c){return/\bstring\b/.test(a.getTokenTypeAt(f(b.line,0)))&&!/^[\'\"`]/.test(c)}var d={},e=/[^\s\u00a0]/,f=a.Pos;a.commands.toggleComment=function(a){a.toggleComment()},a.defineExtension("toggleComment",function(a){a||(a=d);for(var b=this,c=1/0,e=this.listSelections(),g=null,h=e.length-1;h>=0;h--){var i=e[h].from(),j=e[h].to();i.line>=c||(j.line>=c&&(j=f(c,0)),c=i.line,null==g?b.uncomment(i,j,a)?g="un":(b.lineComment(i,j,a),g="line"):"un"==g?b.uncomment(i,j,a):b.lineComment(i,j,a))}}),a.defineExtension("lineComment",function(a,g,h){h||(h=d);var i=this,j=i.getModeAt(a),k=i.getLine(a.line);if(null!=k&&!c(i,a,k)){var l=h.lineComment||j.lineComment;if(!l)return void((h.blockCommentStart||j.blockCommentStart)&&(h.fullLines=!0,i.blockComment(a,g,h)));var m=Math.min(0!=g.ch||g.line==a.line?g.line+1:g.line,i.lastLine()+1),n=null==h.padding?" ":h.padding,o=h.commentBlankLines||a.line==g.line;i.operation(function(){if(h.indent){for(var c=null,d=a.line;m>d;++d){var g=i.getLine(d),j=g.slice(0,b(g));(null==c||c.length>j.length)&&(c=j)}for(var d=a.line;m>d;++d){var g=i.getLine(d),k=c.length;(o||e.test(g))&&(g.slice(0,k)!=c&&(k=b(g)),i.replaceRange(c+l+n,f(d,0),f(d,k)))}}else for(var d=a.line;m>d;++d)(o||e.test(i.getLine(d)))&&i.replaceRange(l+n,f(d,0))})}}),a.defineExtension("blockComment",function(a,b,c){c||(c=d);var g=this,h=g.getModeAt(a),i=c.blockCommentStart||h.blockCommentStart,j=c.blockCommentEnd||h.blockCommentEnd;if(!i||!j)return void((c.lineComment||h.lineComment)&&0!=c.fullLines&&g.lineComment(a,b,c));var k=Math.min(b.line,g.lastLine());k!=a.line&&0==b.ch&&e.test(g.getLine(k))&&--k;var l=null==c.padding?" ":c.padding;a.line>k||g.operation(function(){if(0!=c.fullLines){var d=e.test(g.getLine(k));g.replaceRange(l+j,f(k)),g.replaceRange(i+l,f(a.line,0));var m=c.blockCommentLead||h.blockCommentLead;if(null!=m)for(var n=a.line+1;k>=n;++n)(n!=k||d)&&g.replaceRange(m+l,f(n,0))}else g.replaceRange(j,b),g.replaceRange(i,a)})}),a.defineExtension("uncomment",function(a,b,c){c||(c=d);var g,h=this,i=h.getModeAt(a),j=Math.min(0!=b.ch||b.line==a.line?b.line:b.line-1,h.lastLine()),k=Math.min(a.line,j),l=c.lineComment||i.lineComment,m=[],n=null==c.padding?" ":c.padding;a:if(l){for(var o=k;j>=o;++o){var p=h.getLine(o),q=p.indexOf(l);if(q>-1&&!/comment/.test(h.getTokenTypeAt(f(o,q+1)))&&(q=-1),-1==q&&e.test(p))break a;if(q>-1&&e.test(p.slice(0,q)))break a;m.push(p)}if(h.operation(function(){for(var a=k;j>=a;++a){var b=m[a-k],c=b.indexOf(l),d=c+l.length;0>c||(b.slice(d,d+n.length)==n&&(d+=n.length),g=!0,h.replaceRange("",f(a,c),f(a,d)))}}),g)return!0}var r=c.blockCommentStart||i.blockCommentStart,s=c.blockCommentEnd||i.blockCommentEnd;if(!r||!s)return!1;var t=c.blockCommentLead||i.blockCommentLead,u=h.getLine(k),v=j==k?u:h.getLine(j),w=u.indexOf(r),x=v.lastIndexOf(s);if(-1==x&&k!=j&&(v=h.getLine(--j),x=v.lastIndexOf(s)),-1==w||-1==x||!/comment/.test(h.getTokenTypeAt(f(k,w+1)))||!/comment/.test(h.getTokenTypeAt(f(j,x+1))))return!1;var y=u.lastIndexOf(r,a.ch),z=-1==y?-1:u.slice(0,a.ch).indexOf(s,y+r.length);if(-1!=y&&-1!=z&&z+s.length!=a.ch)return!1;z=v.indexOf(s,b.ch);var A=v.slice(b.ch).lastIndexOf(r,z-b.ch);return y=-1==z||-1==A?-1:b.ch+A,-1!=z&&-1!=y&&y!=b.ch?!1:(h.operation(function(){h.replaceRange("",f(j,x-(n&&v.slice(x-n.length,x)==n?n.length:0)),f(j,x+s.length));var a=w+r.length;if(n&&u.slice(a,a+n.length)==n&&(a+=n.length),h.replaceRange("",f(k,w),f(k,a)),t)for(var b=k+1;j>=b;++b){var c=h.getLine(b),d=c.indexOf(t);if(-1!=d&&!e.test(c.slice(0,d))){var g=d+t.length;n&&c.slice(g,g+n.length)==n&&(g+=n.length),h.replaceRange("",f(b,d),f(b,g))}}}),!0)})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=a.search(e);return b==-1?0:b}function c(a,b,c){return/\bstring\b/.test(a.getTokenTypeAt(f(b.line,0)))&&!/^[\'\"`]/.test(c)}var d={},e=/[^\s\u00a0]/,f=a.Pos;a.commands.toggleComment=function(a){a.toggleComment()},a.defineExtension("toggleComment",(function(a){a||(a=d);for(var b=this,c=1/0,e=this.listSelections(),g=null,h=e.length-1;h>=0;h--){var i=e[h].from(),j=e[h].to();i.line>=c||(j.line>=c&&(j=f(c,0)),c=i.line,null==g?b.uncomment(i,j,a)?g="un":(b.lineComment(i,j,a),g="line"):"un"==g?b.uncomment(i,j,a):b.lineComment(i,j,a))}})),a.defineExtension("lineComment",(function(a,g,h){h||(h=d);var i=this,j=i.getModeAt(a),k=i.getLine(a.line);if(null!=k&&!c(i,a,k)){var l=h.lineComment||j.lineComment;if(!l)return void((h.blockCommentStart||j.blockCommentStart)&&(h.fullLines=!0,i.blockComment(a,g,h)));var m=Math.min(0!=g.ch||g.line==a.line?g.line+1:g.line,i.lastLine()+1),n=null==h.padding?" ":h.padding,o=h.commentBlankLines||a.line==g.line;i.operation((function(){if(h.indent){for(var c=null,d=a.line;dj.length)&&(c=j)}for(var d=a.line;dk||g.operation((function(){if(0!=c.fullLines){var d=e.test(g.getLine(k));g.replaceRange(l+j,f(k)),g.replaceRange(i+l,f(a.line,0));var m=c.blockCommentLead||h.blockCommentLead;if(null!=m)for(var n=a.line+1;n<=k;++n)(n!=k||d)&&g.replaceRange(m+l,f(n,0))}else g.replaceRange(j,b),g.replaceRange(i,a)}))}})),a.defineExtension("uncomment",(function(a,b,c){c||(c=d);var g,h=this,i=h.getModeAt(a),j=Math.min(0!=b.ch||b.line==a.line?b.line:b.line-1,h.lastLine()),k=Math.min(a.line,j),l=c.lineComment||i.lineComment,m=[],n=null==c.padding?" ":c.padding;a:if(l){for(var o=k;o<=j;++o){var p=h.getLine(o),q=p.indexOf(l);if(q>-1&&!/comment/.test(h.getTokenTypeAt(f(o,q+1)))&&(q=-1),q==-1&&e.test(p))break a;if(q>-1&&e.test(p.slice(0,q)))break a;m.push(p)}if(h.operation((function(){for(var a=k;a<=j;++a){var b=m[a-k],c=b.indexOf(l),d=c+l.length;c<0||(b.slice(d,d+n.length)==n&&(d+=n.length),g=!0,h.replaceRange("",f(a,c),f(a,d)))}})),g)return!0}var r=c.blockCommentStart||i.blockCommentStart,s=c.blockCommentEnd||i.blockCommentEnd;if(!r||!s)return!1;var t=c.blockCommentLead||i.blockCommentLead,u=h.getLine(k),v=u.indexOf(r);if(v==-1)return!1;var w=j==k?u:h.getLine(j),x=w.indexOf(s,j==k?v+r.length:0);if(x==-1&&k!=j&&(w=h.getLine(--j),x=w.indexOf(s)),x==-1||!/comment/.test(h.getTokenTypeAt(f(k,v+1)))||!/comment/.test(h.getTokenTypeAt(f(j,x+1))))return!1;var y=u.lastIndexOf(r,a.ch),z=y==-1?-1:u.slice(0,a.ch).indexOf(s,y+r.length);if(y!=-1&&z!=-1&&z+s.length!=a.ch)return!1;z=w.indexOf(s,b.ch);var A=w.slice(b.ch).lastIndexOf(r,z-b.ch);return y=z==-1||A==-1?-1:b.ch+A,(z==-1||y==-1||y==b.ch)&&(h.operation((function(){h.replaceRange("",f(j,x-(n&&w.slice(x-n.length,x)==n?n.length:0)),f(j,x+s.length));var a=v+r.length;if(n&&u.slice(a,a+n.length)==n&&(a+=n.length),h.replaceRange("",f(k,v),f(k,a)),t)for(var b=k+1;b<=j;++b){var c=h.getLine(b),d=c.indexOf(t);if(d!=-1&&!e.test(c.slice(0,d))){var g=d+t.length;n&&c.slice(g,g+n.length)==n&&(g+=n.length),h.replaceRange("",f(b,d),f(b,g))}}})),!0)}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/comment/continuecomment.min.js b/media/editors/codemirror/addon/comment/continuecomment.min.js
index 36236dbcefdf4..f8a6c2ee94bd1 100644
--- a/media/editors/codemirror/addon/comment/continuecomment.min.js
+++ b/media/editors/codemirror/addon/comment/continuecomment.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){function b(b){if(b.getOption("disableInput"))return a.Pass;for(var d,e=b.listSelections(),f=[],g=0;g=m);else if(0==i.string.indexOf(d.blockCommentStart)){if(k=n.slice(0,i.start),!/^\s*$/.test(k)){k="";for(var o=0;oi.start&&/^\s*$/.test(n.slice(0,l))&&(k=n.slice(0,l));null!=k&&(k+=d.blockCommentContinue)}if(null==k&&d.lineComment&&c(b)){var p=b.getLine(h.line),l=p.indexOf(d.lineComment);l>-1&&(k=p.slice(0,l),/\S/.test(k)?k=null:k+=d.lineComment+p.slice(l+d.lineComment.length).match(/^\s*/)[0])}if(null==k)return a.Pass;f[g]="\n"+k}b.operation(function(){for(var a=e.length-1;a>=0;a--)b.replaceRange(f[a],e[a].from(),e[a].to(),"+insert")})}function c(a){var b=a.getOption("continueComments");return b&&"object"==typeof b?b.continueLineComment!==!1:!0}for(var d=["clike","css","javascript"],e=0;e=m);else if(0==i.string.indexOf(d.blockCommentStart)){if(k=n.slice(0,i.start),!/^\s*$/.test(k)){k="";for(var o=0;oi.start&&/^\s*$/.test(n.slice(0,l))&&(k=n.slice(0,l));null!=k&&(k+=d.blockCommentContinue)}if(null==k&&d.lineComment&&c(b)){var p=b.getLine(h.line),l=p.indexOf(d.lineComment);l>-1&&(k=p.slice(0,l),/\S/.test(k)?k=null:k+=d.lineComment+p.slice(l+d.lineComment.length).match(/^\s*/)[0])}if(null==k)return a.Pass;f[g]="\n"+k}b.operation((function(){for(var a=e.length-1;a>=0;a--)b.replaceRange(f[a],e[a].from(),e[a].to(),"+insert")}))}function c(a){var b=a.getOption("continueComments");return!b||"object"!=typeof b||b.continueLineComment!==!1}for(var d=["clike","css","javascript"],e=0;e=l&&g()},200)}),a.on(n,"focus",function(){++l})}}),a.defineExtension("openNotification",function(d,e){function f(){i||(i=!0,clearTimeout(g),h.parentNode.removeChild(h))}c(this,f);var g,h=b(this,d,e&&e.bottom),i=!1,j=e&&"undefined"!=typeof e.duration?e.duration:5e3;return a.on(h,"click",function(b){a.e_preventDefault(b),f()}),j&&(g=setTimeout(f,j)),f})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b,c){var d,e=a.getWrapperElement();return d=e.appendChild(document.createElement("div")),c?d.className="CodeMirror-dialog CodeMirror-dialog-bottom":d.className="CodeMirror-dialog CodeMirror-dialog-top","string"==typeof b?d.innerHTML=b:d.appendChild(b),d}function c(a,b){a.state.currentNotificationClose&&a.state.currentNotificationClose(),a.state.currentNotificationClose=b}a.defineExtension("openDialog",(function(d,e,f){function g(a){if("string"==typeof a)l.value=a;else{if(j)return;j=!0,i.parentNode.removeChild(i),k.focus(),f.onClose&&f.onClose(i)}}f||(f={}),c(this,null);var h,i=b(this,d,f.bottom),j=!1,k=this,l=i.getElementsByTagName("input")[0];return l?(l.focus(),f.value&&(l.value=f.value,f.selectValueOnOpen!==!1&&l.select()),f.onInput&&a.on(l,"input",(function(a){f.onInput(a,l.value,g)})),f.onKeyUp&&a.on(l,"keyup",(function(a){f.onKeyUp(a,l.value,g)})),a.on(l,"keydown",(function(b){f&&f.onKeyDown&&f.onKeyDown(b,l.value,g)||((27==b.keyCode||f.closeOnEnter!==!1&&13==b.keyCode)&&(l.blur(),a.e_stop(b),g()),13==b.keyCode&&e(l.value,b))})),f.closeOnBlur!==!1&&a.on(l,"blur",g)):(h=i.getElementsByTagName("button")[0])&&(a.on(h,"click",(function(){g(),k.focus()})),f.closeOnBlur!==!1&&a.on(h,"blur",g),h.focus()),g})),a.defineExtension("openConfirm",(function(d,e,f){function g(){j||(j=!0,h.parentNode.removeChild(h),k.focus())}c(this,null);var h=b(this,d,f&&f.bottom),i=h.getElementsByTagName("button"),j=!1,k=this,l=1;i[0].focus();for(var m=0;m=0;h--){var k=g[h].head;c.replaceRange("",m(k.line,k.ch-1),m(k.line,k.ch+1),"+delete")}}function f(c){var e=d(c),f=e&&b(e,"explode");if(!f||c.getOption("disableInput"))return a.Pass;for(var g=c.listSelections(),h=0;h0;return{anchor:new m(b.anchor.line,b.anchor.ch+(c?-1:1)),head:new m(b.head.line,b.head.ch+(c?1:-1))}}function h(c,e){var f=d(c);if(!f||c.getOption("disableInput"))return a.Pass;var h=b(f,"pairs"),j=h.indexOf(e);if(-1==j)return a.Pass;for(var l,n=b(f,"triples"),o=h.charAt(j+1)==e,p=c.listSelections(),q=j%2==0,r=0;r1&&n.indexOf(e)>=0&&c.getRange(m(u.line,u.ch-2),u)==e+e&&(u.ch<=2||c.getRange(m(u.line,u.ch-3),m(u.line,u.ch-2))!=e))s="addFour";else if(o){if(a.isWordChar(v)||!k(c,u,e))return a.Pass;s="both"}else{if(!q||c.getLine(u.line).length!=u.ch&&!i(v,h)&&!/\s/.test(v))return a.Pass;s="both"}else s=n.indexOf(e)>=0&&c.getRange(u,m(u.line,u.ch+3))==e+e+e?"skipThree":"skip";if(l){if(l!=s)return a.Pass}else l=s}var w=j%2?h.charAt(j-1):e,x=j%2?e:h.charAt(j+1);c.operation(function(){if("skip"==l)c.execCommand("goCharRight");else if("skipThree"==l)for(var a=0;3>a;a++)c.execCommand("goCharRight");else if("surround"==l){for(var b=c.getSelections(),a=0;a-1&&c%2==1}function j(a,b){var c=a.getRange(m(b.line,b.ch-1),m(b.line,b.ch+1));return 2==c.length?c:null}function k(b,c,d){var e=b.getLine(c.line),f=b.getTokenAt(c);if(/\bstring2?\b/.test(f.type))return!1;var g=new a.StringStream(e.slice(0,c.ch)+d+e.slice(c.ch),4);for(g.pos=g.start=f.start;;){var h=b.getMode().token(g,f.state);if(g.pos>=c.ch+1)return/\bstring2?\b/.test(h);g.start=g.pos}}var l={pairs:"()[]{}''\"\"",triples:"",explode:"[]{}"},m=a.Pos;a.defineOption("autoCloseBrackets",!1,function(b,c,d){d&&d!=a.Init&&(b.removeKeyMap(o),b.state.closeBrackets=null),c&&(b.state.closeBrackets=c,b.addKeyMap(o))});for(var n=l.pairs+"`",o={Backspace:e,Enter:f},p=0;p=0;h--){var k=g[h].head;c.replaceRange("",m(k.line,k.ch-1),m(k.line,k.ch+1),"+delete")}}function f(c){var e=d(c),f=e&&b(e,"explode");if(!f||c.getOption("disableInput"))return a.Pass;for(var g=c.listSelections(),h=0;h0;return{anchor:new m(b.anchor.line,b.anchor.ch+(c?-1:1)),head:new m(b.head.line,b.head.ch+(c?1:-1))}}function h(c,e){var f=d(c);if(!f||c.getOption("disableInput"))return a.Pass;var h=b(f,"pairs"),j=h.indexOf(e);if(j==-1)return a.Pass;for(var l,n=b(f,"triples"),o=h.charAt(j+1)==e,p=c.listSelections(),q=j%2==0,r=0;r1&&n.indexOf(e)>=0&&c.getRange(m(u.line,u.ch-2),u)==e+e&&(u.ch<=2||c.getRange(m(u.line,u.ch-3),m(u.line,u.ch-2))!=e))s="addFour";else if(o){if(a.isWordChar(v)||!k(c,u,e))return a.Pass;s="both"}else{if(!q||c.getLine(u.line).length!=u.ch&&!i(v,h)&&!/\s/.test(v))return a.Pass;s="both"}else s=n.indexOf(e)>=0&&c.getRange(u,m(u.line,u.ch+3))==e+e+e?"skipThree":"skip";if(l){if(l!=s)return a.Pass}else l=s}var w=j%2?h.charAt(j-1):e,x=j%2?e:h.charAt(j+1);c.operation((function(){if("skip"==l)c.execCommand("goCharRight");else if("skipThree"==l)for(var a=0;a<3;a++)c.execCommand("goCharRight");else if("surround"==l){for(var b=c.getSelections(),a=0;a-1&&c%2==1}function j(a,b){var c=a.getRange(m(b.line,b.ch-1),m(b.line,b.ch+1));return 2==c.length?c:null}function k(b,c,d){var e=b.getLine(c.line),f=b.getTokenAt(c);if(/\bstring2?\b/.test(f.type))return!1;var g=new a.StringStream(e.slice(0,c.ch)+d+e.slice(c.ch),4);for(g.pos=g.start=f.start;;){var h=b.getMode().token(g,f.state);if(g.pos>=c.ch+1)return/\bstring2?\b/.test(h);g.start=g.pos}}var l={pairs:"()[]{}''\"\"",triples:"",explode:"[]{}"},m=a.Pos;a.defineOption("autoCloseBrackets",!1,(function(b,c,d){d&&d!=a.Init&&(b.removeKeyMap(o),b.state.closeBrackets=null),c&&(b.state.closeBrackets=c,b.addKeyMap(o))}));for(var n=l.pairs+"`",o={Backspace:e,Enter:f},p=0;pj.ch&&(r=r.slice(0,r.length-k.end+j.ch));var s=r.toLowerCase();if(!r||"string"==k.type&&(k.end!=j.ch||!/[\"\']/.test(k.string.charAt(k.string.length-1))||1==k.string.length)||"tag"==k.type&&"closeTag"==m.type||k.string.indexOf("/")==k.string.length-1||p&&e(p,s)>-1||f(b,r,j,m,!0))return a.Pass;var t=q&&e(q,s)>-1;d[i]={indent:t,text:">"+(t?"\n\n":"")+"",newPos:t?a.Pos(j.line+1,0):a.Pos(j.line,j.ch+1)}}for(var i=c.length-1;i>=0;i--){var u=d[i];b.replaceRange(u.text,c[i].head,c[i].anchor,"+insert");var v=b.listSelections().slice(0);v[i]={head:u.newPos,anchor:u.newPos},b.setSelections(v),u.indent&&(b.indentLine(u.newPos.line,null,!0),b.indentLine(u.newPos.line+1,null,!0))}}function c(b,c){for(var d=b.listSelections(),e=[],g=c?"/":""!=b.getLine(i.line).charAt(j.end)&&(m+=">"),e[h]=m}b.replaceSelections(e),d=b.listSelections();for(var h=0;hc;++c)if(a[c]==b)return c;return-1}function f(b,c,d,e,f){if(!a.scanForClosingTag)return!1;var g=Math.min(b.lastLine()+1,d.line+500),h=a.scanForClosingTag(b,d,null,g);if(!h||h.tag!=c)return!1;for(var i=e.context,j=f?1:0;i&&i.tagName==c;i=i.prev)++j;d=h.to;for(var k=1;j>k;k++){var l=a.scanForClosingTag(b,d,null,g);if(!l||l.tag!=c)return!1;d=l.to}return!0}a.defineOption("autoCloseTags",!1,function(c,e,f){if(f!=a.Init&&f&&c.removeKeyMap("autoCloseTags"),e){var g={name:"autoCloseTags"};("object"!=typeof e||e.whenClosing)&&(g["'/'"]=function(a){return d(a)}),("object"!=typeof e||e.whenOpening)&&(g["'>'"]=function(a){return b(a)}),c.addKeyMap(g)}});var g=["area","base","br","col","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],h=["applet","blockquote","body","button","div","dl","fieldset","form","frameset","h1","h2","h3","h4","h5","h6","head","html","iframe","layer","legend","object","ol","p","select","table","ul"];a.commands.closeTag=function(a){return c(a)}});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)})((function(a){function b(b){if(b.getOption("disableInput"))return a.Pass;for(var c=b.listSelections(),d=[],i=0;ij.ch&&(r=r.slice(0,r.length-k.end+j.ch));var s=r.toLowerCase();if(!r||"string"==k.type&&(k.end!=j.ch||!/[\"\']/.test(k.string.charAt(k.string.length-1))||1==k.string.length)||"tag"==k.type&&"closeTag"==m.type||k.string.indexOf("/")==k.string.length-1||p&&e(p,s)>-1||f(b,r,j,m,!0))return a.Pass;var t=q&&e(q,s)>-1;d[i]={indent:t,text:">"+(t?"\n\n":"")+"",newPos:t?a.Pos(j.line+1,0):a.Pos(j.line,j.ch+1)}}for(var i=c.length-1;i>=0;i--){var u=d[i];b.replaceRange(u.text,c[i].head,c[i].anchor,"+insert");var v=b.listSelections().slice(0);v[i]={head:u.newPos,anchor:u.newPos},b.setSelections(v),u.indent&&(b.indentLine(u.newPos.line,null,!0),b.indentLine(u.newPos.line+1,null,!0))}}function c(b,c){for(var d=b.listSelections(),e=[],g=c?"/":""!=b.getLine(i.line).charAt(j.end)&&(m+=">"),e[h]=m}b.replaceSelections(e),d=b.listSelections();for(var h=0;h'"]=function(a){return b(a)}),c.addKeyMap(g)}}));var g=["area","base","br","col","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],h=["applet","blockquote","body","button","div","dl","fieldset","form","frameset","h1","h2","h3","h4","h5","h6","head","html","iframe","layer","legend","object","ol","p","select","table","ul"];a.commands.closeTag=function(a){return c(a)}}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/edit/continuelist.min.js b/media/editors/codemirror/addon/edit/continuelist.min.js
index 7d4f518d0b183..04f5f8190b132 100644
--- a/media/editors/codemirror/addon/edit/continuelist.min.js
+++ b/media/editors/codemirror/addon/edit/continuelist.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";var b=/^(\s*)(>[> ]*|[*+-]\s|(\d+)([.)]))(\s*)/,c=/^(\s*)(>[> ]*|[*+-]|(\d+)[.)])(\s*)$/,d=/[*+-]\s/;a.commands.newlineAndIndentContinueMarkdownList=function(e){if(e.getOption("disableInput"))return a.Pass;for(var f=e.listSelections(),g=[],h=0;h")>=0?n[2]:parseInt(n[3],10)+1+n[4];g[h]="\n"+o+q+p}}e.replaceSelections(g)}});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";var b=/^(\s*)(>[> ]*|[*+-]\s|(\d+)([.)]))(\s*)/,c=/^(\s*)(>[> ]*|[*+-]|(\d+)[.)])(\s*)$/,d=/[*+-]\s/;a.commands.newlineAndIndentContinueMarkdownList=function(e){if(e.getOption("disableInput"))return a.Pass;for(var f=e.listSelections(),g=[],h=0;h")>=0?n[2]:parseInt(n[3],10)+1+n[4];g[h]="\n"+o+q+p}}e.replaceSelections(g)}}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/edit/matchbrackets.min.js b/media/editors/codemirror/addon/edit/matchbrackets.min.js
index 1b9421ea5d718..56c2c5e281ec0 100644
--- a/media/editors/codemirror/addon/edit/matchbrackets.min.js
+++ b/media/editors/codemirror/addon/edit/matchbrackets.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){function b(a,b,d,e){var f=a.getLineHandle(b.line),i=b.ch-1,j=i>=0&&h[f.text.charAt(i)]||h[f.text.charAt(++i)];if(!j)return null;var k=">"==j.charAt(1)?1:-1;if(d&&k>0!=(i==b.ch))return null;var l=a.getTokenTypeAt(g(b.line,i+1)),m=c(a,g(b.line,i+(k>0?1:0)),k,l||null,e);return null==m?null:{from:g(b.line,i),to:m&&m.pos,match:m&&m.ch==j.charAt(0),forward:k>0}}function c(a,b,c,d,e){for(var f=e&&e.maxScanLineLength||1e4,i=e&&e.maxScanLines||1e3,j=[],k=e&&e.bracketRegex?e.bracketRegex:/[(){}[\]]/,l=c>0?Math.min(b.line+i,a.lastLine()+1):Math.max(a.firstLine()-1,b.line-i),m=b.line;m!=l;m+=c){var n=a.getLine(m);if(n){var o=c>0?0:n.length-1,p=c>0?n.length:-1;if(!(n.length>f))for(m==b.line&&(o=b.ch-(0>c?1:0));o!=p;o+=c){var q=n.charAt(o);if(k.test(q)&&(void 0===d||a.getTokenTypeAt(g(m,o+1))==d)){var r=h[q];if(">"==r.charAt(1)==c>0)j.push(q);else{if(!j.length)return{pos:g(m,o),ch:q};j.pop()}}}}}return m-c==(c>0?a.lastLine():a.firstLine())?!1:null}function d(a,c,d){for(var e=a.state.matchBrackets.maxHighlightLineLength||1e3,h=[],i=a.listSelections(),j=0;j",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"},i=null;a.defineOption("matchBrackets",!1,function(b,c,d){d&&d!=a.Init&&(b.off("cursorActivity",e),i&&(i(),i=null)),c&&(b.state.matchBrackets="object"==typeof c?c:{},b.on("cursorActivity",e))}),a.defineExtension("matchBrackets",function(){d(this,!0)}),a.defineExtension("findMatchingBracket",function(a,c,d){return b(this,a,c,d)}),a.defineExtension("scanForBracket",function(a,b,d,e){return c(this,a,b,d,e)})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b,d,e){var f=a.getLineHandle(b.line),i=b.ch-1,j=i>=0&&h[f.text.charAt(i)]||h[f.text.charAt(++i)];if(!j)return null;var k=">"==j.charAt(1)?1:-1;if(d&&k>0!=(i==b.ch))return null;var l=a.getTokenTypeAt(g(b.line,i+1)),m=c(a,g(b.line,i+(k>0?1:0)),k,l||null,e);return null==m?null:{from:g(b.line,i),to:m&&m.pos,match:m&&m.ch==j.charAt(0),forward:k>0}}function c(a,b,c,d,e){for(var f=e&&e.maxScanLineLength||1e4,i=e&&e.maxScanLines||1e3,j=[],k=e&&e.bracketRegex?e.bracketRegex:/[(){}[\]]/,l=c>0?Math.min(b.line+i,a.lastLine()+1):Math.max(a.firstLine()-1,b.line-i),m=b.line;m!=l;m+=c){var n=a.getLine(m);if(n){var o=c>0?0:n.length-1,p=c>0?n.length:-1;if(!(n.length>f))for(m==b.line&&(o=b.ch-(c<0?1:0));o!=p;o+=c){var q=n.charAt(o);if(k.test(q)&&(void 0===d||a.getTokenTypeAt(g(m,o+1))==d)){var r=h[q];if(">"==r.charAt(1)==c>0)j.push(q);else{if(!j.length)return{pos:g(m,o),ch:q};j.pop()}}}}}return m-c!=(c>0?a.lastLine():a.firstLine())&&null}function d(a,c,d){for(var e=a.state.matchBrackets.maxHighlightLineLength||1e3,h=[],i=a.listSelections(),j=0;j",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"},i=null;a.defineOption("matchBrackets",!1,(function(b,c,d){d&&d!=a.Init&&(b.off("cursorActivity",e),i&&(i(),i=null)),c&&(b.state.matchBrackets="object"==typeof c?c:{},b.on("cursorActivity",e))})),a.defineExtension("matchBrackets",(function(){d(this,!0)})),a.defineExtension("findMatchingBracket",(function(a,c,d){return b(this,a,c,d)})),a.defineExtension("scanForBracket",(function(a,b,d,e){return c(this,a,b,d,e)}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/edit/matchtags.min.js b/media/editors/codemirror/addon/edit/matchtags.min.js
index ed9b892c62ffb..1013d9ff1ca3c 100644
--- a/media/editors/codemirror/addon/edit/matchtags.min.js
+++ b/media/editors/codemirror/addon/edit/matchtags.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)}(function(a){"use strict";function b(a){a.state.tagHit&&a.state.tagHit.clear(),a.state.tagOther&&a.state.tagOther.clear(),a.state.tagHit=a.state.tagOther=null}function c(c){c.state.failedTagMatch=!1,c.operation(function(){if(b(c),!c.somethingSelected()){var d=c.getCursor(),e=c.getViewport();e.from=Math.min(e.from,d.line),e.to=Math.max(d.line+1,e.to);var f=a.findMatchingTag(c,d,e);if(f){if(c.state.matchBothTags){var g="open"==f.at?f.open:f.close;g&&(c.state.tagHit=c.markText(g.from,g.to,{className:"CodeMirror-matchingtag"}))}var h="close"==f.at?f.open:f.close;h?c.state.tagOther=c.markText(h.from,h.to,{className:"CodeMirror-matchingtag"}):c.state.failedTagMatch=!0}}})}function d(a){a.state.failedTagMatch&&c(a)}a.defineOption("matchTags",!1,function(e,f,g){g&&g!=a.Init&&(e.off("cursorActivity",c),e.off("viewportChange",d),b(e)),f&&(e.state.matchBothTags="object"==typeof f&&f.bothTags,e.on("cursorActivity",c),e.on("viewportChange",d),c(e))}),a.commands.toMatchingTag=function(b){var c=a.findMatchingTag(b,b.getCursor());if(c){var d="close"==c.at?c.open:c.close;d&&b.extendSelection(d.to,d.from)}}});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)})((function(a){"use strict";function b(a){a.state.tagHit&&a.state.tagHit.clear(),a.state.tagOther&&a.state.tagOther.clear(),a.state.tagHit=a.state.tagOther=null}function c(c){c.state.failedTagMatch=!1,c.operation((function(){if(b(c),!c.somethingSelected()){var d=c.getCursor(),e=c.getViewport();e.from=Math.min(e.from,d.line),e.to=Math.max(d.line+1,e.to);var f=a.findMatchingTag(c,d,e);if(f){if(c.state.matchBothTags){var g="open"==f.at?f.open:f.close;g&&(c.state.tagHit=c.markText(g.from,g.to,{className:"CodeMirror-matchingtag"}))}var h="close"==f.at?f.open:f.close;h?c.state.tagOther=c.markText(h.from,h.to,{className:"CodeMirror-matchingtag"}):c.state.failedTagMatch=!0}}}))}function d(a){a.state.failedTagMatch&&c(a)}a.defineOption("matchTags",!1,(function(e,f,g){g&&g!=a.Init&&(e.off("cursorActivity",c),e.off("viewportChange",d),b(e)),f&&(e.state.matchBothTags="object"==typeof f&&f.bothTags,e.on("cursorActivity",c),e.on("viewportChange",d),c(e))})),a.commands.toMatchingTag=function(b){var c=a.findMatchingTag(b,b.getCursor());if(c){var d="close"==c.at?c.open:c.close;d&&b.extendSelection(d.to,d.from)}}}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/edit/trailingspace.min.js b/media/editors/codemirror/addon/edit/trailingspace.min.js
index 3751c2cdeeaac..994db403fa78d 100644
--- a/media/editors/codemirror/addon/edit/trailingspace.min.js
+++ b/media/editors/codemirror/addon/edit/trailingspace.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){a.defineOption("showTrailingSpace",!1,function(b,c,d){d==a.Init&&(d=!1),d&&!c?b.removeOverlay("trailingspace"):!d&&c&&b.addOverlay({token:function(a){for(var b=a.string.length,c=b;c&&/\s/.test(a.string.charAt(c-1));--c);return c>a.pos?(a.pos=c,null):(a.pos=b,"trailingspace")},name:"trailingspace"})})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){a.defineOption("showTrailingSpace",!1,(function(b,c,d){d==a.Init&&(d=!1),d&&!c?b.removeOverlay("trailingspace"):!d&&c&&b.addOverlay({token:function(a){for(var b=a.string.length,c=b;c&&/\s/.test(a.string.charAt(c-1));--c);return c>a.pos?(a.pos=c,null):(a.pos=b,"trailingspace")},name:"trailingspace"})}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/fold/brace-fold.min.js b/media/editors/codemirror/addon/fold/brace-fold.min.js
index 69ca5ad51906b..49d8c2cc4874a 100644
--- a/media/editors/codemirror/addon/fold/brace-fold.min.js
+++ b/media/editors/codemirror/addon/fold/brace-fold.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";a.registerHelper("fold","brace",function(b,c){function d(d){for(var h=c.ch,i=0;;){var j=0>=h?-1:g.lastIndexOf(d,h-1);if(-1!=j){if(1==i&&j=o;++o)for(var p=b.getLine(o),q=o==f?j:0;;){var r=p.indexOf(h,q),s=p.indexOf(i,q);if(0>r&&(r=p.length),0>s&&(s=p.length),q=Math.min(r,s),q==p.length)break;if(b.getTokenTypeAt(a.Pos(o,q+1))==e)if(q==r)++m;else if(!--m){k=o,l=q;break a}++q}if(null!=k&&(f!=k||l!=j))return{from:a.Pos(f,j),to:a.Pos(k,l)}}}),a.registerHelper("fold","import",function(b,c){function d(c){if(cb.lastLine())return null;var d=b.getTokenAt(a.Pos(c,1));if(/\S/.test(d.string)||(d=b.getTokenAt(a.Pos(c,d.end+1))),"keyword"!=d.type||"import"!=d.string)return null;for(var e=c,f=Math.min(b.lastLine(),c+10);f>=e;++e){var g=b.getLine(e),h=g.indexOf(";");if(-1!=h)return{startCh:d.end,end:a.Pos(e,h)}}}var e,f=c.line,g=d(f);if(!g||d(f-1)||(e=d(f-2))&&e.end.line==f-1)return null;for(var h=g.end;;){var i=d(h.line+1);if(null==i)break;h=i.end}return{from:b.clipPos(a.Pos(f,g.startCh+1)),to:h}}),a.registerHelper("fold","include",function(b,c){function d(c){if(cb.lastLine())return null;var d=b.getTokenAt(a.Pos(c,1));return/\S/.test(d.string)||(d=b.getTokenAt(a.Pos(c,d.end+1))),"meta"==d.type&&"#include"==d.string.slice(0,8)?d.start+8:void 0}var e=c.line,f=d(e);if(null==f||null!=d(e-1))return null;for(var g=e;;){var h=d(g+1);if(null==h)break;++g}return{from:a.Pos(e,f+1),to:b.clipPos(a.Pos(g))}})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("fold","brace",(function(b,c){function d(d){for(var h=c.ch,i=0;;){var j=h<=0?-1:g.lastIndexOf(d,h-1);if(j!=-1){if(1==i&&jb.lastLine())return null;var d=b.getTokenAt(a.Pos(c,1));if(/\S/.test(d.string)||(d=b.getTokenAt(a.Pos(c,d.end+1))),"keyword"!=d.type||"import"!=d.string)return null;for(var e=c,f=Math.min(b.lastLine(),c+10);e<=f;++e){var g=b.getLine(e),h=g.indexOf(";");if(h!=-1)return{startCh:d.end,end:a.Pos(e,h)}}}var e,f=c.line,g=d(f);if(!g||d(f-1)||(e=d(f-2))&&e.end.line==f-1)return null;for(var h=g.end;;){var i=d(h.line+1);if(null==i)break;h=i.end}return{from:b.clipPos(a.Pos(f,g.startCh+1)),to:h}})),a.registerHelper("fold","include",(function(b,c){function d(c){if(cb.lastLine())return null;var d=b.getTokenAt(a.Pos(c,1));return/\S/.test(d.string)||(d=b.getTokenAt(a.Pos(c,d.end+1))),"meta"==d.type&&"#include"==d.string.slice(0,8)?d.start+8:void 0}var e=c.line,f=d(e);if(null==f||null!=d(e-1))return null;for(var g=e;;){var h=d(g+1);if(null==h)break;++g}return{from:a.Pos(e,f+1),to:b.clipPos(a.Pos(g))}}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/fold/comment-fold.min.js b/media/editors/codemirror/addon/fold/comment-fold.min.js
index 0e8e5e13a6097..92076a372e857 100644
--- a/media/editors/codemirror/addon/fold/comment-fold.min.js
+++ b/media/editors/codemirror/addon/fold/comment-fold.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";a.registerGlobalHelper("fold","comment",function(a){return a.blockCommentStart&&a.blockCommentEnd},function(b,c){var d=b.getModeAt(c),e=d.blockCommentStart,f=d.blockCommentEnd;if(e&&f){for(var g,h=c.line,i=b.getLine(h),j=c.ch,k=0;;){var l=0>=j?-1:i.lastIndexOf(e,j-1);if(-1!=l){if(1==k&&l=q;++q)for(var r=b.getLine(q),s=q==h?g:0;;){var t=r.indexOf(e,s),u=r.indexOf(f,s);if(0>t&&(t=r.length),0>u&&(u=r.length),s=Math.min(t,u),s==r.length)break;if(s==t)++o;else if(!--o){m=q,n=s;break a}++s}if(null!=m&&(h!=m||n!=g))return{from:a.Pos(h,g),to:a.Pos(m,n)}}})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerGlobalHelper("fold","comment",(function(a){return a.blockCommentStart&&a.blockCommentEnd}),(function(b,c){var d=b.getModeAt(c),e=d.blockCommentStart,f=d.blockCommentEnd;if(e&&f){for(var g,h=c.line,i=b.getLine(h),j=c.ch,k=0;;){var l=j<=0?-1:i.lastIndexOf(e,j-1);if(l!=-1){if(1==k&&lb.firstLine();)e=a.Pos(e.line-1,0),k=h(!1);if(k&&!k.cleared&&"unfold"!==g){var l=c(b,f);a.on(l,"mousedown",function(b){m.clear(),a.e_preventDefault(b)});var m=b.markText(k.from,k.to,{replacedWith:l,clearOnEnter:d(b,f,"clearOnEnter"),__isFold:!0});m.on("clear",function(c,d){a.signal(b,"unfold",b,c,d)}),a.signal(b,"fold",b,k.from,k.to)}}function c(a,b){var c=d(a,b,"widget");if("string"==typeof c){var e=document.createTextNode(c);c=document.createElement("span"),c.appendChild(e),c.className="CodeMirror-foldmarker"}return c}function d(a,b,c){if(b&&void 0!==b[c])return b[c];var d=a.options.foldOptions;return d&&void 0!==d[c]?d[c]:e[c]}a.newFoldFunction=function(a,c){return function(d,e){b(d,e,{rangeFinder:a,widget:c})}},a.defineExtension("foldCode",function(a,c,d){b(this,a,c,d)}),a.defineExtension("isFolded",function(a){for(var b=this.findMarksAt(a),c=0;c=c;c++)b.foldCode(a.Pos(c,0),null,"fold")})},a.commands.unfoldAll=function(b){b.operation(function(){for(var c=b.firstLine(),d=b.lastLine();d>=c;c++)b.foldCode(a.Pos(c,0),null,"unfold")})},a.registerHelper("fold","combine",function(){var a=Array.prototype.slice.call(arguments,0);return function(b,c){for(var d=0;db.firstLine();)e=a.Pos(e.line-1,0),k=h(!1);if(k&&!k.cleared&&"unfold"!==g){var l=c(b,f);a.on(l,"mousedown",(function(b){m.clear(),a.e_preventDefault(b)}));var m=b.markText(k.from,k.to,{replacedWith:l,clearOnEnter:d(b,f,"clearOnEnter"),__isFold:!0});m.on("clear",(function(c,d){a.signal(b,"unfold",b,c,d)})),a.signal(b,"fold",b,k.from,k.to)}}function c(a,b){var c=d(a,b,"widget");if("string"==typeof c){var e=document.createTextNode(c);c=document.createElement("span"),c.appendChild(e),c.className="CodeMirror-foldmarker"}return c}function d(a,b,c){if(b&&void 0!==b[c])return b[c];var d=a.options.foldOptions;return d&&void 0!==d[c]?d[c]:e[c]}a.newFoldFunction=function(a,c){return function(d,e){b(d,e,{rangeFinder:a,widget:c})}},a.defineExtension("foldCode",(function(a,c,d){b(this,a,c,d)})),a.defineExtension("isFolded",(function(a){for(var b=this.findMarksAt(a),c=0;c=h&&(c=e(f.indicatorOpen))}a.setGutterMarker(b,f.gutter,c),++g})}function g(a){var b=a.getViewport(),c=a.state.foldGutter;c&&(a.operation(function(){f(a,b.from,b.to)}),c.from=b.from,c.to=b.to)}function h(a,b,c){var e=a.state.foldGutter;if(e){var f=e.options;if(c==f.gutter){var g=d(a,b);g?g.clear():a.foldCode(l(b,0),f.rangeFinder)}}}function i(a){var b=a.state.foldGutter;if(b){var c=b.options;b.from=b.to=0,clearTimeout(b.changeUpdate),b.changeUpdate=setTimeout(function(){g(a)},c.foldOnChangeTimeSpan||600)}}function j(a){var b=a.state.foldGutter;if(b){var c=b.options;clearTimeout(b.changeUpdate),b.changeUpdate=setTimeout(function(){var c=a.getViewport();b.from==b.to||c.from-b.to>20||b.from-c.to>20?g(a):a.operation(function(){c.fromb.to&&(f(a,b.to,c.to),b.to=c.to)})},c.updateViewportTimeSpan||400)}}function k(a,b){var c=a.state.foldGutter;if(c){var d=b.line;d>=c.from&&d=h&&(c=e(f.indicatorOpen))}a.setGutterMarker(b,f.gutter,c),++g}))}function g(a){var b=a.getViewport(),c=a.state.foldGutter;c&&(a.operation((function(){f(a,b.from,b.to)})),c.from=b.from,c.to=b.to)}function h(a,b,c){var e=a.state.foldGutter;if(e){var f=e.options;if(c==f.gutter){var g=d(a,b);g?g.clear():a.foldCode(l(b,0),f.rangeFinder)}}}function i(a){var b=a.state.foldGutter;if(b){var c=b.options;b.from=b.to=0,clearTimeout(b.changeUpdate),b.changeUpdate=setTimeout((function(){g(a)}),c.foldOnChangeTimeSpan||600)}}function j(a){var b=a.state.foldGutter;if(b){var c=b.options;clearTimeout(b.changeUpdate),b.changeUpdate=setTimeout((function(){var c=a.getViewport();b.from==b.to||c.from-b.to>20||b.from-c.to>20?g(a):a.operation((function(){c.fromb.to&&(f(a,b.to,c.to),b.to=c.to)}))}),c.updateViewportTimeSpan||400)}}function k(a,b){var c=a.state.foldGutter;if(c){var d=b.line;d>=c.from&&d=i;++i){var k=b.getLine(i),l=f(k);if(l>g)h=i;else if(/\S/.test(k))break}return h?{from:a.Pos(c.line,e.length),to:a.Pos(h,b.getLine(h).length)}:void 0}})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("fold","indent",(function(b,c){var d=b.getOption("tabSize"),e=b.getLine(c.line);if(/\S/.test(e)){for(var f=function(b){return a.countColumn(b,null,d)},g=f(e),h=null,i=c.line+1,j=b.lastLine();i<=j;++i){var k=b.getLine(i),l=f(k);if(l>g)h=i;else if(/\S/.test(k))break}return h?{from:a.Pos(c.line,e.length),to:a.Pos(h,b.getLine(h).length)}:void 0}}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/fold/markdown-fold.min.js b/media/editors/codemirror/addon/fold/markdown-fold.min.js
index 10f647c4d277b..2bc2d4941e8a3 100644
--- a/media/editors/codemirror/addon/fold/markdown-fold.min.js
+++ b/media/editors/codemirror/addon/fold/markdown-fold.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";a.registerHelper("fold","markdown",function(b,c){function d(c){var d=b.getTokenTypeAt(a.Pos(c,0));return d&&/\bheader\b/.test(d)}function e(a,b,c){var e=b&&b.match(/^#+/);return e&&d(a)?e[0].length:(e=c&&c.match(/^[=\-]+\s*$/),e&&d(a+1)?"="==c[0]?1:2:f)}var f=100,g=b.getLine(c.line),h=b.getLine(c.line+1),i=e(c.line,g,h);if(i===f)return void 0;for(var j=b.lastLine(),k=c.line,l=b.getLine(k+2);j>k&&!(e(k+1,h,l)<=i);)++k,h=l,l=b.getLine(k+2);return{from:a.Pos(c.line,g.length),to:a.Pos(k,b.getLine(k).length)}})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("fold","markdown",(function(b,c){function d(c){var d=b.getTokenTypeAt(a.Pos(c,0));return d&&/\bheader\b/.test(d)}function e(a,b,c){var e=b&&b.match(/^#+/);return e&&d(a)?e[0].length:(e=c&&c.match(/^[=\-]+\s*$/),e&&d(a+1)?"="==c[0]?1:2:f)}var f=100,g=b.getLine(c.line),h=b.getLine(c.line+1),i=e(c.line,g,h);if(i!==f){for(var j=b.lastLine(),k=c.line,l=b.getLine(k+2);k=a.max?void 0:(a.ch=0,a.text=a.cm.getLine(++a.line),!0)}function f(a){return a.line<=a.min?void 0:(a.text=a.cm.getLine(--a.line),a.ch=a.text.length,!0)}function g(a){for(;;){var b=a.text.indexOf(">",a.ch);if(-1==b){if(e(a))continue;return}{if(d(a,b+1)){var c=a.text.lastIndexOf("/",b),f=c>-1&&!/\S/.test(a.text.slice(c+1,b));return a.ch=b+1,f?"selfClose":"regular"}a.ch=b+1}}}function h(a){for(;;){var b=a.ch?a.text.lastIndexOf("<",a.ch-1):-1;if(-1==b){if(f(a))continue;return}if(d(a,b+1)){p.lastIndex=b,a.ch=b;var c=p.exec(a.text);if(c&&c.index==b)return c}else a.ch=b}}function i(a){for(;;){p.lastIndex=a.ch;var b=p.exec(a.text);if(!b){if(e(a))continue;return}{if(d(a,b.index+1))return a.ch=b.index+b[0].length,b;a.ch=b.index+1}}}function j(a){for(;;){var b=a.ch?a.text.lastIndexOf(">",a.ch-1):-1;if(-1==b){if(f(a))continue;return}{if(d(a,b+1)){var c=a.text.lastIndexOf("/",b),e=c>-1&&!/\S/.test(a.text.slice(c+1,b));return a.ch=b+1,e?"selfClose":"regular"}a.ch=b}}}function k(a,b){for(var c=[];;){var d,e=i(a),f=a.line,h=a.ch-(e?e[0].length:0);if(!e||!(d=g(a)))return;if("selfClose"!=d)if(e[1]){for(var j=c.length-1;j>=0;--j)if(c[j]==e[2]){c.length=j;break}if(0>j&&(!b||b==e[2]))return{tag:e[2],from:m(f,h),to:m(a.line,a.ch)}}else c.push(e[2])}}function l(a,b){for(var c=[];;){var d=j(a);if(!d)return;if("selfClose"!=d){var e=a.line,f=a.ch,g=h(a);if(!g)return;if(g[1])c.push(g[2]);else{for(var i=c.length-1;i>=0;--i)if(c[i]==g[2]){c.length=i;break}if(0>i&&(!b||b==g[2]))return{tag:g[2],from:m(a.line,a.ch),to:m(e,f)}}}else h(a)}}var m=a.Pos,n="A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",o=n+"-:.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040",p=new RegExp("<(/?)(["+n+"]["+o+"]*)","g");a.registerHelper("fold","xml",function(a,b){for(var d=new c(a,b.line,0);;){var e,f=i(d);if(!f||d.line!=b.line||!(e=g(d)))return;if(!f[1]&&"selfClose"!=e){var h=m(d.line,d.ch),j=k(d,f[2]);return j&&{from:h,to:j.from}}}}),a.findMatchingTag=function(a,d,e){var f=new c(a,d.line,d.ch,e);if(-1!=f.text.indexOf(">")||-1!=f.text.indexOf("<")){var i=g(f),j=i&&m(f.line,f.ch),n=i&&h(f);if(i&&n&&!(b(f,d)>0)){var o={from:m(f.line,f.ch),to:j,tag:n[2]};return"selfClose"==i?{open:o,close:null,at:"open"}:n[1]?{open:l(f,n[2]),close:o,at:"close"}:(f=new c(a,j.line,j.ch,e),{open:o,close:k(f,n[2]),at:"open"})}}},a.findEnclosingTag=function(a,b,d){for(var e=new c(a,b.line,b.ch,d);;){var f=l(e);if(!f)break;var g=new c(a,b.line,b.ch,d),h=k(g,f.tag);if(h)return{open:f,close:h}}},a.scanForClosingTag=function(a,b,d,e){var f=new c(a,b.line,b.ch,e?{from:0,to:e}:null);return k(f,d)}});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return a.line-b.line||a.ch-b.ch}function c(a,b,c,d){this.line=b,this.ch=c,this.cm=a,this.text=a.getLine(b),this.min=d?Math.max(d.from,a.firstLine()):a.firstLine(),this.max=d?Math.min(d.to-1,a.lastLine()):a.lastLine()}function d(a,b){var c=a.cm.getTokenTypeAt(m(a.line,b));return c&&/\btag\b/.test(c)}function e(a){if(!(a.line>=a.max))return a.ch=0,a.text=a.cm.getLine(++a.line),!0}function f(a){if(!(a.line<=a.min))return a.text=a.cm.getLine(--a.line),a.ch=a.text.length,!0}function g(a){for(;;){var b=a.text.indexOf(">",a.ch);if(b==-1){if(e(a))continue;return}{if(d(a,b+1)){var c=a.text.lastIndexOf("/",b),f=c>-1&&!/\S/.test(a.text.slice(c+1,b));return a.ch=b+1,f?"selfClose":"regular"}a.ch=b+1}}}function h(a){for(;;){var b=a.ch?a.text.lastIndexOf("<",a.ch-1):-1;if(b==-1){if(f(a))continue;return}if(d(a,b+1)){p.lastIndex=b,a.ch=b;var c=p.exec(a.text);if(c&&c.index==b)return c}else a.ch=b}}function i(a){for(;;){p.lastIndex=a.ch;var b=p.exec(a.text);if(!b){if(e(a))continue;return}{if(d(a,b.index+1))return a.ch=b.index+b[0].length,b;a.ch=b.index+1}}}function j(a){for(;;){var b=a.ch?a.text.lastIndexOf(">",a.ch-1):-1;if(b==-1){if(f(a))continue;return}{if(d(a,b+1)){var c=a.text.lastIndexOf("/",b),e=c>-1&&!/\S/.test(a.text.slice(c+1,b));return a.ch=b+1,e?"selfClose":"regular"}a.ch=b}}}function k(a,b){for(var c=[];;){var d,e=i(a),f=a.line,h=a.ch-(e?e[0].length:0);if(!e||!(d=g(a)))return;if("selfClose"!=d)if(e[1]){for(var j=c.length-1;j>=0;--j)if(c[j]==e[2]){c.length=j;break}if(j<0&&(!b||b==e[2]))return{tag:e[2],from:m(f,h),to:m(a.line,a.ch)}}else c.push(e[2])}}function l(a,b){for(var c=[];;){var d=j(a);if(!d)return;if("selfClose"!=d){var e=a.line,f=a.ch,g=h(a);if(!g)return;if(g[1])c.push(g[2]);else{for(var i=c.length-1;i>=0;--i)if(c[i]==g[2]){c.length=i;break}if(i<0&&(!b||b==g[2]))return{tag:g[2],from:m(a.line,a.ch),to:m(e,f)}}}else h(a)}}var m=a.Pos,n="A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",o=n+"-:.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040",p=new RegExp("<(/?)(["+n+"]["+o+"]*)","g");a.registerHelper("fold","xml",(function(a,b){for(var d=new c(a,b.line,0);;){var e,f=i(d);if(!f||d.line!=b.line||!(e=g(d)))return;if(!f[1]&&"selfClose"!=e){var h=m(d.line,d.ch),j=k(d,f[2]);return j&&{from:h,to:j.from}}}})),a.findMatchingTag=function(a,d,e){var f=new c(a,d.line,d.ch,e);if(f.text.indexOf(">")!=-1||f.text.indexOf("<")!=-1){var i=g(f),j=i&&m(f.line,f.ch),n=i&&h(f);if(i&&n&&!(b(f,d)>0)){var o={from:m(f.line,f.ch),to:j,tag:n[2]};return"selfClose"==i?{open:o,close:null,at:"open"}:n[1]?{open:l(f,n[2]),close:o,at:"close"}:(f=new c(a,j.line,j.ch,e),{open:o,close:k(f,n[2]),at:"open"})}}},a.findEnclosingTag=function(a,b,d){for(var e=new c(a,b.line,b.ch,d);;){var f=l(e);if(!f)break;var g=new c(a,b.line,b.ch,d),h=k(g,f.tag);if(h)return{open:f,close:h}}},a.scanForClosingTag=function(a,b,d,e){var f=new c(a,b.line,b.ch,e?{from:0,to:e}:null);return k(f,d)}}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/hint/anyword-hint.min.js b/media/editors/codemirror/addon/hint/anyword-hint.min.js
index a5fc719d491da..575fe4d9d8ba9 100644
--- a/media/editors/codemirror/addon/hint/anyword-hint.min.js
+++ b/media/editors/codemirror/addon/hint/anyword-hint.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";var b=/[\w$]+/,c=500;a.registerHelper("hint","anyword",function(d,e){for(var f=e&&e.word||b,g=e&&e.range||c,h=d.getCursor(),i=d.getLine(h.line),j=h.ch,k=j;k&&f.test(i.charAt(k-1));)--k;for(var l=k!=j&&i.slice(k,j),m=e&&e.list||[],n={},o=new RegExp(f.source,"g"),p=-1;1>=p;p+=2)for(var q=h.line,r=Math.min(Math.max(q+p*g,d.firstLine()),d.lastLine())+p;q!=r;q+=p)for(var s,t=d.getLine(q);s=o.exec(t);)(q!=h.line||s[0]!==l)&&(l&&0!=s[0].lastIndexOf(l,0)||Object.prototype.hasOwnProperty.call(n,s[0])||(n[s[0]]=!0,m.push(s[0])));return{list:m,from:a.Pos(h.line,k),to:a.Pos(h.line,j)}})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";var b=/[\w$]+/,c=500;a.registerHelper("hint","anyword",(function(d,e){for(var f=e&&e.word||b,g=e&&e.range||c,h=d.getCursor(),i=d.getLine(h.line),j=h.ch,k=j;k&&f.test(i.charAt(k-1));)--k;for(var l=k!=j&&i.slice(k,j),m=e&&e.list||[],n={},o=new RegExp(f.source,"g"),p=-1;p<=1;p+=2)for(var q=h.line,r=Math.min(Math.max(q+p*g,d.firstLine()),d.lastLine())+p;q!=r;q+=p)for(var s,t=d.getLine(q);s=o.exec(t);)q==h.line&&s[0]===l||l&&0!=s[0].lastIndexOf(l,0)||Object.prototype.hasOwnProperty.call(n,s[0])||(n[s[0]]=!0,m.push(s[0]));return{list:m,from:a.Pos(h.line,k),to:a.Pos(h.line,j)}}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/hint/css-hint.min.js b/media/editors/codemirror/addon/hint/css-hint.min.js
index f2c3f476805c8..02bac741aa021 100644
--- a/media/editors/codemirror/addon/hint/css-hint.min.js
+++ b/media/editors/codemirror/addon/hint/css-hint.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../mode/css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../mode/css/css"],a):a(CodeMirror)}(function(a){"use strict";var b={link:1,visited:1,active:1,hover:1,focus:1,"first-letter":1,"first-line":1,"first-child":1,before:1,after:1,lang:1};a.registerHelper("hint","css",function(c){function d(a){for(var b in a)j&&0!=b.lastIndexOf(j,0)||l.push(b)}var e=c.getCursor(),f=c.getTokenAt(e),g=a.innerMode(c.getMode(),f.state);if("css"==g.mode.name){if("keyword"==f.type&&0=="!important".indexOf(f.string))return{list:["!important"],from:a.Pos(e.line,f.start),to:a.Pos(e.line,f.end)};var h=f.start,i=e.ch,j=f.string.slice(0,i-h);/[^\w$_-]/.test(j)&&(j="",h=i=e.ch);var k=a.resolveMode("text/css"),l=[],m=g.state.state;return"pseudo"==m||"variable-3"==f.type?d(b):"block"==m||"maybeprop"==m?d(k.propertyKeywords):"prop"==m||"parens"==m||"at"==m||"params"==m?(d(k.valueKeywords),d(k.colorKeywords)):("media"==m||"media_parens"==m)&&(d(k.mediaTypes),d(k.mediaFeatures)),l.length?{list:l,from:a.Pos(e.line,h),to:a.Pos(e.line,i)}:void 0}})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../mode/css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../mode/css/css"],a):a(CodeMirror)})((function(a){"use strict";var b={link:1,visited:1,active:1,hover:1,focus:1,"first-letter":1,"first-line":1,"first-child":1,before:1,after:1,lang:1};a.registerHelper("hint","css",(function(c){function d(a){for(var b in a)j&&0!=b.lastIndexOf(j,0)||l.push(b)}var e=c.getCursor(),f=c.getTokenAt(e),g=a.innerMode(c.getMode(),f.state);if("css"==g.mode.name){if("keyword"==f.type&&0=="!important".indexOf(f.string))return{list:["!important"],from:a.Pos(e.line,f.start),to:a.Pos(e.line,f.end)};var h=f.start,i=e.ch,j=f.string.slice(0,i-h);/[^\w$_-]/.test(j)&&(j="",h=i=e.ch);var k=a.resolveMode("text/css"),l=[],m=g.state.state;return"pseudo"==m||"variable-3"==f.type?d(b):"block"==m||"maybeprop"==m?d(k.propertyKeywords):"prop"==m||"parens"==m||"at"==m||"params"==m?(d(k.valueKeywords),d(k.colorKeywords)):"media"!=m&&"media_parens"!=m||(d(k.mediaTypes),d(k.mediaFeatures)),l.length?{list:l,from:a.Pos(e.line,h),to:a.Pos(e.line,i)}:void 0}}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/hint/html-hint.min.js b/media/editors/codemirror/addon/hint/html-hint.min.js
index 30b96ba7d6248..cd649c189a202 100644
--- a/media/editors/codemirror/addon/hint/html-hint.min.js
+++ b/media/editors/codemirror/addon/hint/html-hint.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./xml-hint")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./xml-hint"],a):a(CodeMirror)}(function(a){"use strict";function b(a){for(var b in l)l.hasOwnProperty(b)&&(a.attrs[b]=l[b])}function c(b,c){var d={schemaInfo:k};if(c)for(var e in c)d[e]=c[e];return a.hint.xml(b,d)}var d="ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" "),e=["_blank","_self","_top","_parent"],f=["ascii","utf-8","utf-16","latin1","latin1"],g=["get","post","put","delete"],h=["application/x-www-form-urlencoded","multipart/form-data","text/plain"],i=["all","screen","print","embossed","braille","handheld","print","projection","screen","tty","tv","speech","3d-glasses","resolution [>][<][=] [X]","device-aspect-ratio: X/Y","orientation:portrait","orientation:landscape","device-height: [X]","device-width: [X]"],j={attrs:{}},k={a:{attrs:{href:null,ping:null,type:null,media:i,target:e,hreflang:d}},abbr:j,acronym:j,address:j,applet:j,area:{attrs:{alt:null,coords:null,href:null,target:null,ping:null,media:i,hreflang:d,type:null,shape:["default","rect","circle","poly"]}},article:j,aside:j,audio:{attrs:{src:null,mediagroup:null,crossorigin:["anonymous","use-credentials"],preload:["none","metadata","auto"],autoplay:["","autoplay"],loop:["","loop"],controls:["","controls"]}},b:j,base:{attrs:{href:null,target:e}},basefont:j,bdi:j,bdo:j,big:j,blockquote:{attrs:{cite:null}},body:j,br:j,button:{attrs:{form:null,formaction:null,name:null,value:null,autofocus:["","autofocus"],disabled:["","autofocus"],formenctype:h,formmethod:g,formnovalidate:["","novalidate"],formtarget:e,type:["submit","reset","button"]}},canvas:{attrs:{width:null,height:null}},caption:j,center:j,cite:j,code:j,col:{attrs:{span:null}},colgroup:{attrs:{span:null}},command:{attrs:{type:["command","checkbox","radio"],label:null,icon:null,radiogroup:null,command:null,title:null,disabled:["","disabled"],checked:["","checked"]}},data:{attrs:{value:null}},datagrid:{attrs:{disabled:["","disabled"],multiple:["","multiple"]}},datalist:{attrs:{data:null}},dd:j,del:{attrs:{cite:null,datetime:null}},details:{attrs:{open:["","open"]}},dfn:j,dir:j,div:j,dl:j,dt:j,em:j,embed:{attrs:{src:null,type:null,width:null,height:null}},eventsource:{attrs:{src:null}},fieldset:{attrs:{disabled:["","disabled"],form:null,name:null}},figcaption:j,figure:j,font:j,footer:j,form:{attrs:{action:null,name:null,"accept-charset":f,autocomplete:["on","off"],enctype:h,method:g,novalidate:["","novalidate"],target:e}},frame:j,frameset:j,h1:j,h2:j,h3:j,h4:j,h5:j,h6:j,head:{attrs:{},children:["title","base","link","style","meta","script","noscript","command"]},header:j,hgroup:j,hr:j,html:{attrs:{manifest:null},children:["head","body"]},i:j,iframe:{attrs:{src:null,srcdoc:null,name:null,width:null,height:null,sandbox:["allow-top-navigation","allow-same-origin","allow-forms","allow-scripts"],seamless:["","seamless"]}},img:{attrs:{alt:null,src:null,ismap:null,usemap:null,width:null,height:null,crossorigin:["anonymous","use-credentials"]}},input:{attrs:{alt:null,dirname:null,form:null,formaction:null,height:null,list:null,max:null,maxlength:null,min:null,name:null,pattern:null,placeholder:null,size:null,src:null,step:null,value:null,width:null,accept:["audio/*","video/*","image/*"],autocomplete:["on","off"],autofocus:["","autofocus"],checked:["","checked"],disabled:["","disabled"],formenctype:h,formmethod:g,formnovalidate:["","novalidate"],formtarget:e,multiple:["","multiple"],readonly:["","readonly"],required:["","required"],type:["hidden","text","search","tel","url","email","password","datetime","date","month","week","time","datetime-local","number","range","color","checkbox","radio","file","submit","image","reset","button"]}},ins:{attrs:{cite:null,datetime:null}},kbd:j,keygen:{attrs:{challenge:null,form:null,name:null,autofocus:["","autofocus"],disabled:["","disabled"],keytype:["RSA"]}},label:{attrs:{"for":null,form:null}},legend:j,li:{attrs:{value:null}},link:{attrs:{href:null,type:null,hreflang:d,media:i,sizes:["all","16x16","16x16 32x32","16x16 32x32 64x64"]}},map:{attrs:{name:null}},mark:j,menu:{attrs:{label:null,type:["list","context","toolbar"]}},meta:{attrs:{content:null,charset:f,name:["viewport","application-name","author","description","generator","keywords"],"http-equiv":["content-language","content-type","default-style","refresh"]}},meter:{attrs:{value:null,min:null,low:null,high:null,max:null,optimum:null}},nav:j,noframes:j,noscript:j,object:{attrs:{data:null,type:null,name:null,usemap:null,form:null,width:null,height:null,typemustmatch:["","typemustmatch"]}},ol:{attrs:{reversed:["","reversed"],start:null,type:["1","a","A","i","I"]}},optgroup:{attrs:{disabled:["","disabled"],label:null}},option:{attrs:{disabled:["","disabled"],label:null,selected:["","selected"],value:null}},output:{attrs:{"for":null,form:null,name:null}},p:j,param:{attrs:{name:null,value:null}},pre:j,progress:{attrs:{value:null,max:null}},q:{attrs:{cite:null}},rp:j,rt:j,ruby:j,s:j,samp:j,script:{attrs:{type:["text/javascript"],src:null,async:["","async"],defer:["","defer"],charset:f}},section:j,select:{attrs:{form:null,name:null,size:null,autofocus:["","autofocus"],disabled:["","disabled"],multiple:["","multiple"]}},small:j,source:{attrs:{src:null,type:null,media:null}},span:j,strike:j,strong:j,style:{attrs:{type:["text/css"],media:i,scoped:null}},sub:j,summary:j,sup:j,table:j,tbody:j,td:{attrs:{colspan:null,rowspan:null,headers:null}},textarea:{attrs:{dirname:null,form:null,maxlength:null,name:null,placeholder:null,rows:null,cols:null,autofocus:["","autofocus"],disabled:["","disabled"],readonly:["","readonly"],required:["","required"],wrap:["soft","hard"]}},tfoot:j,th:{attrs:{colspan:null,rowspan:null,headers:null,scope:["row","col","rowgroup","colgroup"]}},thead:j,time:{attrs:{datetime:null}},title:j,tr:j,track:{attrs:{src:null,label:null,"default":null,kind:["subtitles","captions","descriptions","chapters","metadata"],srclang:d}},tt:j,u:j,ul:j,"var":j,video:{attrs:{src:null,poster:null,width:null,height:null,crossorigin:["anonymous","use-credentials"],preload:["auto","metadata","none"],autoplay:["","autoplay"],mediagroup:["movie"],muted:["","muted"],controls:["","controls"]}},wbr:j},l={accesskey:["a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","0","1","2","3","4","5","6","7","8","9"],"class":null,contenteditable:["true","false"],contextmenu:null,dir:["ltr","rtl","auto"],draggable:["true","false","auto"],dropzone:["copy","move","link","string:","file:"],hidden:["hidden"],id:null,inert:["inert"],itemid:null,itemprop:null,itemref:null,itemscope:["itemscope"],itemtype:null,lang:["en","es"],spellcheck:["true","false"],style:null,tabindex:["1","2","3","4","5","6","7","8","9"],title:null,translate:["yes","no"],onclick:null,rel:["stylesheet","alternate","author","bookmark","help","license","next","nofollow","noreferrer","prefetch","prev","search","tag"]};b(j);for(var m in k)k.hasOwnProperty(m)&&k[m]!=j&&b(k[m]);a.htmlSchema=k,a.registerHelper("hint","html",c)});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./xml-hint")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./xml-hint"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b in l)l.hasOwnProperty(b)&&(a.attrs[b]=l[b])}function c(b,c){var d={schemaInfo:k};if(c)for(var e in c)d[e]=c[e];return a.hint.xml(b,d)}var d="ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" "),e=["_blank","_self","_top","_parent"],f=["ascii","utf-8","utf-16","latin1","latin1"],g=["get","post","put","delete"],h=["application/x-www-form-urlencoded","multipart/form-data","text/plain"],i=["all","screen","print","embossed","braille","handheld","print","projection","screen","tty","tv","speech","3d-glasses","resolution [>][<][=] [X]","device-aspect-ratio: X/Y","orientation:portrait","orientation:landscape","device-height: [X]","device-width: [X]"],j={attrs:{}},k={a:{attrs:{href:null,ping:null,type:null,media:i,target:e,hreflang:d}},abbr:j,acronym:j,address:j,applet:j,area:{attrs:{alt:null,coords:null,href:null,target:null,ping:null,media:i,hreflang:d,type:null,shape:["default","rect","circle","poly"]}},article:j,aside:j,audio:{attrs:{src:null,mediagroup:null,crossorigin:["anonymous","use-credentials"],preload:["none","metadata","auto"],autoplay:["","autoplay"],loop:["","loop"],controls:["","controls"]}},b:j,base:{attrs:{href:null,target:e}},basefont:j,bdi:j,bdo:j,big:j,blockquote:{attrs:{cite:null}},body:j,br:j,button:{attrs:{form:null,formaction:null,name:null,value:null,autofocus:["","autofocus"],disabled:["","autofocus"],formenctype:h,formmethod:g,formnovalidate:["","novalidate"],formtarget:e,type:["submit","reset","button"]}},canvas:{attrs:{width:null,height:null}},caption:j,center:j,cite:j,code:j,col:{attrs:{span:null}},colgroup:{attrs:{span:null}},command:{attrs:{type:["command","checkbox","radio"],label:null,icon:null,radiogroup:null,command:null,title:null,disabled:["","disabled"],checked:["","checked"]}},data:{attrs:{value:null}},datagrid:{attrs:{disabled:["","disabled"],multiple:["","multiple"]}},datalist:{attrs:{data:null}},dd:j,del:{attrs:{cite:null,datetime:null}},details:{attrs:{open:["","open"]}},dfn:j,dir:j,div:j,dl:j,dt:j,em:j,embed:{attrs:{src:null,type:null,width:null,height:null}},eventsource:{attrs:{src:null}},fieldset:{attrs:{disabled:["","disabled"],form:null,name:null}},figcaption:j,figure:j,font:j,footer:j,form:{attrs:{action:null,name:null,"accept-charset":f,autocomplete:["on","off"],enctype:h,method:g,novalidate:["","novalidate"],target:e}},frame:j,frameset:j,h1:j,h2:j,h3:j,h4:j,h5:j,h6:j,head:{attrs:{},children:["title","base","link","style","meta","script","noscript","command"]},header:j,hgroup:j,hr:j,html:{attrs:{manifest:null},children:["head","body"]},i:j,iframe:{attrs:{src:null,srcdoc:null,name:null,width:null,height:null,sandbox:["allow-top-navigation","allow-same-origin","allow-forms","allow-scripts"],seamless:["","seamless"]}},img:{attrs:{alt:null,src:null,ismap:null,usemap:null,width:null,height:null,crossorigin:["anonymous","use-credentials"]}},input:{attrs:{alt:null,dirname:null,form:null,formaction:null,height:null,list:null,max:null,maxlength:null,min:null,name:null,pattern:null,placeholder:null,size:null,src:null,step:null,value:null,width:null,accept:["audio/*","video/*","image/*"],autocomplete:["on","off"],autofocus:["","autofocus"],checked:["","checked"],disabled:["","disabled"],formenctype:h,formmethod:g,formnovalidate:["","novalidate"],formtarget:e,multiple:["","multiple"],readonly:["","readonly"],required:["","required"],type:["hidden","text","search","tel","url","email","password","datetime","date","month","week","time","datetime-local","number","range","color","checkbox","radio","file","submit","image","reset","button"]}},ins:{attrs:{cite:null,datetime:null}},kbd:j,keygen:{attrs:{challenge:null,form:null,name:null,autofocus:["","autofocus"],disabled:["","disabled"],keytype:["RSA"]}},label:{attrs:{for:null,form:null}},legend:j,li:{attrs:{value:null}},link:{attrs:{href:null,type:null,hreflang:d,media:i,sizes:["all","16x16","16x16 32x32","16x16 32x32 64x64"]}},map:{attrs:{name:null}},mark:j,menu:{attrs:{label:null,type:["list","context","toolbar"]}},meta:{attrs:{content:null,charset:f,name:["viewport","application-name","author","description","generator","keywords"],"http-equiv":["content-language","content-type","default-style","refresh"]}},meter:{attrs:{value:null,min:null,low:null,high:null,max:null,optimum:null}},nav:j,noframes:j,noscript:j,object:{attrs:{data:null,type:null,name:null,usemap:null,form:null,width:null,height:null,typemustmatch:["","typemustmatch"]}},ol:{attrs:{reversed:["","reversed"],start:null,type:["1","a","A","i","I"]}},optgroup:{attrs:{disabled:["","disabled"],label:null}},option:{attrs:{disabled:["","disabled"],label:null,selected:["","selected"],value:null}},output:{attrs:{for:null,form:null,name:null}},p:j,param:{attrs:{name:null,value:null}},pre:j,progress:{attrs:{value:null,max:null}},q:{attrs:{cite:null}},rp:j,rt:j,ruby:j,s:j,samp:j,script:{attrs:{type:["text/javascript"],src:null,async:["","async"],defer:["","defer"],charset:f}},section:j,select:{attrs:{form:null,name:null,size:null,autofocus:["","autofocus"],disabled:["","disabled"],multiple:["","multiple"]}},small:j,source:{attrs:{src:null,type:null,media:null}},span:j,strike:j,strong:j,style:{attrs:{type:["text/css"],media:i,scoped:null}},sub:j,summary:j,sup:j,table:j,tbody:j,td:{attrs:{colspan:null,rowspan:null,headers:null}},textarea:{attrs:{dirname:null,form:null,maxlength:null,name:null,placeholder:null,rows:null,cols:null,autofocus:["","autofocus"],disabled:["","disabled"],readonly:["","readonly"],required:["","required"],wrap:["soft","hard"]}},tfoot:j,th:{attrs:{colspan:null,rowspan:null,headers:null,scope:["row","col","rowgroup","colgroup"]}},thead:j,time:{attrs:{datetime:null}},title:j,tr:j,track:{attrs:{src:null,label:null,default:null,kind:["subtitles","captions","descriptions","chapters","metadata"],srclang:d}},tt:j,u:j,ul:j,var:j,video:{attrs:{src:null,poster:null,width:null,height:null,crossorigin:["anonymous","use-credentials"],preload:["auto","metadata","none"],autoplay:["","autoplay"],mediagroup:["movie"],muted:["","muted"],controls:["","controls"]}},wbr:j},l={accesskey:["a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","0","1","2","3","4","5","6","7","8","9"],class:null,contenteditable:["true","false"],contextmenu:null,dir:["ltr","rtl","auto"],draggable:["true","false","auto"],dropzone:["copy","move","link","string:","file:"],hidden:["hidden"],id:null,inert:["inert"],itemid:null,itemprop:null,itemref:null,itemscope:["itemscope"],itemtype:null,lang:["en","es"],spellcheck:["true","false"],style:null,tabindex:["1","2","3","4","5","6","7","8","9"],title:null,translate:["yes","no"],onclick:null,rel:["stylesheet","alternate","author","bookmark","help","license","next","nofollow","noreferrer","prefetch","prev","search","tag"]};b(j);for(var m in k)k.hasOwnProperty(m)&&k[m]!=j&&b(k[m]);a.htmlSchema=k,a.registerHelper("hint","html",c)}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/hint/javascript-hint.min.js b/media/editors/codemirror/addon/hint/javascript-hint.min.js
index 0baf499f679ff..f5a5ec37d1089 100644
--- a/media/editors/codemirror/addon/hint/javascript-hint.min.js
+++ b/media/editors/codemirror/addon/hint/javascript-hint.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){function b(a,b){for(var c=0,d=a.length;d>c;++c)b(a[c])}function c(a,b){if(!Array.prototype.indexOf){for(var c=a.length;c--;)if(a[c]===b)return!0;return!1}return-1!=a.indexOf(b)}function d(b,c,d,e){var f=b.getCursor(),g=d(b,f);if(!/\b(?:string|comment)\b/.test(g.type)){g.state=a.innerMode(b.getMode(),g.state).state,/^[\w$_]*$/.test(g.string)?g.end>f.ch&&(g.end=f.ch,g.string=g.string.slice(0,f.ch-g.start)):g={start:f.ch,end:f.ch,string:"",state:g.state,type:"."==g.string?"property":null};for(var h=g;"property"==h.type;){if(h=d(b,j(f.line,h.start)),"."!=h.string)return;if(h=d(b,j(f.line,h.start)),!k)var k=[];k.push(h)}return{list:i(g,k,c,e),from:j(f.line,g.start),to:j(f.line,g.end)}}}function e(a,b){return d(a,n,function(a,b){return a.getTokenAt(b)},b)}function f(a,b){var c=a.getTokenAt(b);return b.ch==c.start+1&&"."==c.string.charAt(0)?(c.end=c.start,c.string=".",c.type="property"):/^\.[\w$_]*$/.test(c.string)&&(c.type="property",c.start++,c.string=c.string.replace(/\./,"")),c}function g(a,b){return d(a,o,f,b)}function h(a,b){if(Object.getOwnPropertyNames&&Object.getPrototypeOf)for(var c=a;c;c=Object.getPrototypeOf(c))Object.getOwnPropertyNames(c).forEach(b);else for(var d in a)b(d)}function i(a,d,e,f){function g(a){0!=a.lastIndexOf(n,0)||c(j,a)||j.push(a)}function i(a){"string"==typeof a?b(k,g):a instanceof Array?b(l,g):a instanceof Function&&b(m,g),h(a,g)}var j=[],n=a.string,o=f&&f.globalScope||window;if(d&&d.length){var p,q=d.pop();for(q.type&&0===q.type.indexOf("variable")?(f&&f.additionalContext&&(p=f.additionalContext[q.string]),f&&f.useGlobalScope===!1||(p=p||o[q.string])):"string"==q.type?p="":"atom"==q.type?p=1:"function"==q.type&&(null==o.jQuery||"$"!=q.string&&"jQuery"!=q.string||"function"!=typeof o.jQuery?null!=o._&&"_"==q.string&&"function"==typeof o._&&(p=o._()):p=o.jQuery());null!=p&&d.length;)p=p[d.pop().string];null!=p&&i(p)}else{for(var r=a.state.localVars;r;r=r.next)g(r.name);for(var r=a.state.globalVars;r;r=r.next)g(r.name);f&&f.useGlobalScope===!1||i(o),b(e,g)}return j}var j=a.Pos;a.registerHelper("hint","javascript",e),a.registerHelper("hint","coffeescript",g);var k="charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight toUpperCase toLowerCase split concat match replace search".split(" "),l="length concat join splice push pop shift unshift slice reverse sort indexOf lastIndexOf every some filter forEach map reduce reduceRight ".split(" "),m="prototype apply call bind".split(" "),n="break case catch continue debugger default delete do else false finally for function if in instanceof new null return switch throw true try typeof var void while with".split(" "),o="and break catch class continue delete do else extends false finally for if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes".split(" ")});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b){for(var c=0,d=a.length;cf.ch&&(g.end=f.ch,g.string=g.string.slice(0,f.ch-g.start)):g={start:f.ch,end:f.ch,string:"",state:g.state,type:"."==g.string?"property":null};for(var h=g;"property"==h.type;){if(h=d(b,j(f.line,h.start)),"."!=h.string)return;if(h=d(b,j(f.line,h.start)),!k)var k=[];k.push(h)}return{list:i(g,k,c,e),from:j(f.line,g.start),to:j(f.line,g.end)}}}function e(a,b){return d(a,n,(function(a,b){return a.getTokenAt(b)}),b)}function f(a,b){var c=a.getTokenAt(b);return b.ch==c.start+1&&"."==c.string.charAt(0)?(c.end=c.start,c.string=".",c.type="property"):/^\.[\w$_]*$/.test(c.string)&&(c.type="property",c.start++,c.string=c.string.replace(/\./,"")),c}function g(a,b){return d(a,o,f,b)}function h(a,b){if(Object.getOwnPropertyNames&&Object.getPrototypeOf)for(var c=a;c;c=Object.getPrototypeOf(c))Object.getOwnPropertyNames(c).forEach(b);else for(var d in a)b(d)}function i(a,d,e,f){function g(a){0!=a.lastIndexOf(n,0)||c(j,a)||j.push(a)}function i(a){"string"==typeof a?b(k,g):a instanceof Array?b(l,g):a instanceof Function&&b(m,g),h(a,g)}var j=[],n=a.string,o=f&&f.globalScope||window;if(d&&d.length){var p,q=d.pop();for(q.type&&0===q.type.indexOf("variable")?(f&&f.additionalContext&&(p=f.additionalContext[q.string]),f&&f.useGlobalScope===!1||(p=p||o[q.string])):"string"==q.type?p="":"atom"==q.type?p=1:"function"==q.type&&(null==o.jQuery||"$"!=q.string&&"jQuery"!=q.string||"function"!=typeof o.jQuery?null!=o._&&"_"==q.string&&"function"==typeof o._&&(p=o._()):p=o.jQuery());null!=p&&d.length;)p=p[d.pop().string];null!=p&&i(p)}else{for(var r=a.state.localVars;r;r=r.next)g(r.name);for(var r=a.state.globalVars;r;r=r.next)g(r.name);f&&f.useGlobalScope===!1||i(o),b(e,g)}return j}var j=a.Pos;a.registerHelper("hint","javascript",e),a.registerHelper("hint","coffeescript",g);var k="charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight toUpperCase toLowerCase split concat match replace search".split(" "),l="length concat join splice push pop shift unshift slice reverse sort indexOf lastIndexOf every some filter forEach map reduce reduceRight ".split(" "),m="prototype apply call bind".split(" "),n="break case catch continue debugger default delete do else false finally for function if in instanceof new null return switch throw true try typeof var void while with".split(" "),o="and break catch class continue delete do else extends false finally for if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes".split(" ")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/hint/show-hint.min.js b/media/editors/codemirror/addon/hint/show-hint.min.js
index 23b93dabc2e2c..96643695b5236 100644
--- a/media/editors/codemirror/addon/hint/show-hint.min.js
+++ b/media/editors/codemirror/addon/hint/show-hint.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";function b(a,b){this.cm=a,this.options=b,this.widget=null,this.debounce=0,this.tick=0,this.startPos=this.cm.getCursor("start"),this.startLen=this.cm.getLine(this.startPos.line).length-this.cm.getSelection().length;var c=this;a.on("cursorActivity",this.activityFunc=function(){c.cursorActivity()})}function c(b,c){var d=a.cmpPos(c.from,b.from);return d>0&&b.to.ch-b.from.ch!=c.to.ch-c.from.ch}function d(a,b,c){var d=a.options.hintOptions,e={};for(var f in p)e[f]=p[f];if(d)for(var f in d)void 0!==d[f]&&(e[f]=d[f]);if(c)for(var f in c)void 0!==c[f]&&(e[f]=c[f]);return e.hint.resolve&&(e.hint=e.hint.resolve(a,b)),e}function e(a){return"string"==typeof a?a:a.text}function f(a,b){function c(a,c){var e;e="string"!=typeof c?function(a){return c(a,b)}:d.hasOwnProperty(c)?d[c]:c,f[a]=e}var d={Up:function(){b.moveFocus(-1)},Down:function(){b.moveFocus(1)},PageUp:function(){b.moveFocus(-b.menuSize()+1,!0)},PageDown:function(){b.moveFocus(b.menuSize()-1,!0)},Home:function(){b.setFocus(0)},End:function(){b.setFocus(b.length-1)},Enter:b.pick,Tab:b.pick,Esc:b.close},e=a.options.customKeys,f=e?{}:d;if(e)for(var g in e)e.hasOwnProperty(g)&&c(g,e[g]);var h=a.options.extraKeys;if(h)for(var g in h)h.hasOwnProperty(g)&&c(g,h[g]);return f}function g(a,b){for(;b&&b!=a;){if("LI"===b.nodeName.toUpperCase()&&b.parentNode==a)return b;b=b.parentNode}}function h(b,c){this.completion=b,this.data=c,this.picked=!1;var d=this,h=b.cm,i=this.hints=document.createElement("ul");i.className="CodeMirror-hints",this.selectedHint=c.selectedHint||0;for(var j=c.list,k=0;ki.clientHeight+1,z=h.getScrollInfo();if(x>0){var A=w.bottom-w.top,B=q.top-(q.bottom-w.top);if(B-A>0)i.style.top=(s=q.top-A)+"px",t=!1;else if(A>v){i.style.height=v-5+"px",i.style.top=(s=q.bottom-w.top)+"px";var C=h.getCursor();c.from.ch!=C.ch&&(q=h.cursorCoords(C),i.style.left=(r=q.left)+"px",w=i.getBoundingClientRect())}}var D=w.right-u;if(D>0&&(w.right-w.left>u&&(i.style.width=u-5+"px",D-=w.right-w.left-u),i.style.left=(r=q.left-D)+"px"),y)for(var E=i.firstChild;E;E=E.nextSibling)E.style.paddingRight=h.display.nativeBarWidth+"px";if(h.addKeyMap(this.keyMap=f(b,{moveFocus:function(a,b){d.changeActive(d.selectedHint+a,b)},setFocus:function(a){d.changeActive(a)},menuSize:function(){return d.screenAmount()},length:j.length,close:function(){b.close()},pick:function(){d.pick()},data:c})),b.options.closeOnUnfocus){var F;h.on("blur",this.onBlur=function(){F=setTimeout(function(){b.close()},100)}),h.on("focus",this.onFocus=function(){clearTimeout(F)})}return h.on("scroll",this.onScroll=function(){var a=h.getScrollInfo(),c=h.getWrapperElement().getBoundingClientRect(),d=s+z.top-a.top,e=d-(window.pageYOffset||(document.documentElement||document.body).scrollTop);return t||(e+=i.offsetHeight),e<=c.top||e>=c.bottom?b.close():(i.style.top=d+"px",void(i.style.left=r+z.left-a.left+"px"))}),a.on(i,"dblclick",function(a){var b=g(i,a.target||a.srcElement);b&&null!=b.hintId&&(d.changeActive(b.hintId),d.pick())}),a.on(i,"click",function(a){var c=g(i,a.target||a.srcElement);c&&null!=c.hintId&&(d.changeActive(c.hintId),b.options.completeOnSingleClick&&d.pick())}),a.on(i,"mousedown",function(){setTimeout(function(){h.focus()},20)}),a.signal(c,"select",j[0],i.firstChild),!0}function i(a,b){if(!a.somethingSelected())return b;for(var c=[],d=0;d0?b(a):d(e+1)})}var f=i(a,e);d(0)};return f.async=!0,f.supportsSelection=!0,f}return(d=b.getHelper(b.getCursor(),"hintWords"))?function(b){return a.hint.fromList(b,{words:d})}:a.hint.anyword?function(b,c){return a.hint.anyword(b,c)}:function(){}}var l="CodeMirror-hint",m="CodeMirror-hint-active";a.showHint=function(a,b,c){if(!b)return a.showHint(c);c&&c.async&&(b.async=!0);var d={hint:b};if(c)for(var e in c)d[e]=c[e];return a.showHint(d)},a.defineExtension("showHint",function(c){c=d(this,this.getCursor("start"),c);var e=this.listSelections();if(!(e.length>1)){if(this.somethingSelected()){if(!c.hint.supportsSelection)return;for(var f=0;f=this.data.list.length?b=c?this.data.list.length-1:0:0>b&&(b=c?0:this.data.list.length-1),this.selectedHint!=b){var d=this.hints.childNodes[this.selectedHint];d.className=d.className.replace(" "+m,""),d=this.hints.childNodes[this.selectedHint=b],d.className+=" "+m,d.offsetTopthis.hints.scrollTop+this.hints.clientHeight&&(this.hints.scrollTop=d.offsetTop+d.offsetHeight-this.hints.clientHeight+3),a.signal(this.data,"select",this.data.list[this.selectedHint],d)}},screenAmount:function(){return Math.floor(this.hints.clientHeight/this.hints.firstChild.offsetHeight)||1}},a.registerHelper("hint","auto",{resolve:k}),a.registerHelper("hint","fromList",function(b,c){var d=b.getCursor(),e=b.getTokenAt(d),f=a.Pos(d.line,e.end);if(e.string&&/\w/.test(e.string[e.string.length-1]))var g=e.string,h=a.Pos(d.line,e.start);else var g="",h=f;for(var i=[],j=0;j,]/,closeOnUnfocus:!0,completeOnSingleClick:!0,container:null,customKeys:null,extraKeys:null};a.defineOption("hintOptions",null)});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){this.cm=a,this.options=b,this.widget=null,this.debounce=0,this.tick=0,this.startPos=this.cm.getCursor("start"),this.startLen=this.cm.getLine(this.startPos.line).length-this.cm.getSelection().length;var c=this;a.on("cursorActivity",this.activityFunc=function(){c.cursorActivity()})}function c(b,c){var d=a.cmpPos(c.from,b.from);return d>0&&b.to.ch-b.from.ch!=c.to.ch-c.from.ch}function d(a,b,c){var d=a.options.hintOptions,e={};for(var f in p)e[f]=p[f];if(d)for(var f in d)void 0!==d[f]&&(e[f]=d[f]);if(c)for(var f in c)void 0!==c[f]&&(e[f]=c[f]);return e.hint.resolve&&(e.hint=e.hint.resolve(a,b)),e}function e(a){return"string"==typeof a?a:a.text}function f(a,b){function c(a,c){var e;e="string"!=typeof c?function(a){return c(a,b)}:d.hasOwnProperty(c)?d[c]:c,f[a]=e}var d={Up:function(){b.moveFocus(-1)},Down:function(){b.moveFocus(1)},PageUp:function(){b.moveFocus(-b.menuSize()+1,!0)},PageDown:function(){b.moveFocus(b.menuSize()-1,!0)},Home:function(){b.setFocus(0)},End:function(){b.setFocus(b.length-1)},Enter:b.pick,Tab:b.pick,Esc:b.close},e=a.options.customKeys,f=e?{}:d;if(e)for(var g in e)e.hasOwnProperty(g)&&c(g,e[g]);var h=a.options.extraKeys;if(h)for(var g in h)h.hasOwnProperty(g)&&c(g,h[g]);return f}function g(a,b){for(;b&&b!=a;){if("LI"===b.nodeName.toUpperCase()&&b.parentNode==a)return b;b=b.parentNode}}function h(b,c){this.completion=b,this.data=c,this.picked=!1;var d=this,h=b.cm,i=this.hints=document.createElement("ul");i.className="CodeMirror-hints",this.selectedHint=c.selectedHint||0;for(var j=c.list,k=0;ki.clientHeight+1,z=h.getScrollInfo();if(x>0){var A=w.bottom-w.top,B=q.top-(q.bottom-w.top);if(B-A>0)i.style.top=(s=q.top-A)+"px",t=!1;else if(A>v){i.style.height=v-5+"px",i.style.top=(s=q.bottom-w.top)+"px";var C=h.getCursor();c.from.ch!=C.ch&&(q=h.cursorCoords(C),i.style.left=(r=q.left)+"px",w=i.getBoundingClientRect())}}var D=w.right-u;if(D>0&&(w.right-w.left>u&&(i.style.width=u-5+"px",D-=w.right-w.left-u),i.style.left=(r=q.left-D)+"px"),y)for(var E=i.firstChild;E;E=E.nextSibling)E.style.paddingRight=h.display.nativeBarWidth+"px";if(h.addKeyMap(this.keyMap=f(b,{moveFocus:function(a,b){d.changeActive(d.selectedHint+a,b)},setFocus:function(a){d.changeActive(a)},menuSize:function(){return d.screenAmount()},length:j.length,close:function(){b.close()},pick:function(){d.pick()},data:c})),b.options.closeOnUnfocus){var F;h.on("blur",this.onBlur=function(){F=setTimeout((function(){b.close()}),100)}),h.on("focus",this.onFocus=function(){clearTimeout(F)})}return h.on("scroll",this.onScroll=function(){var a=h.getScrollInfo(),c=h.getWrapperElement().getBoundingClientRect(),d=s+z.top-a.top,e=d-(window.pageYOffset||(document.documentElement||document.body).scrollTop);return t||(e+=i.offsetHeight),e<=c.top||e>=c.bottom?b.close():(i.style.top=d+"px",void(i.style.left=r+z.left-a.left+"px"))}),a.on(i,"dblclick",(function(a){var b=g(i,a.target||a.srcElement);b&&null!=b.hintId&&(d.changeActive(b.hintId),d.pick())})),a.on(i,"click",(function(a){var c=g(i,a.target||a.srcElement);c&&null!=c.hintId&&(d.changeActive(c.hintId),b.options.completeOnSingleClick&&d.pick())})),a.on(i,"mousedown",(function(){setTimeout((function(){h.focus()}),20)})),a.signal(c,"select",j[0],i.firstChild),!0}function i(a,b){if(!a.somethingSelected())return b;for(var c=[],d=0;d0?b(a):d(e+1)}))}var f=i(a,e);d(0)};return f.async=!0,f.supportsSelection=!0,f}return(d=b.getHelper(b.getCursor(),"hintWords"))?function(b){return a.hint.fromList(b,{words:d})}:a.hint.anyword?function(b,c){return a.hint.anyword(b,c)}:function(){}}var l="CodeMirror-hint",m="CodeMirror-hint-active";a.showHint=function(a,b,c){if(!b)return a.showHint(c);c&&c.async&&(b.async=!0);var d={hint:b};if(c)for(var e in c)d[e]=c[e];return a.showHint(d)},a.defineExtension("showHint",(function(c){c=d(this,this.getCursor("start"),c);var e=this.listSelections();if(!(e.length>1)){if(this.somethingSelected()){if(!c.hint.supportsSelection)return;for(var f=0;f=this.data.list.length?b=c?this.data.list.length-1:0:b<0&&(b=c?0:this.data.list.length-1),this.selectedHint!=b){var d=this.hints.childNodes[this.selectedHint];d.className=d.className.replace(" "+m,""),d=this.hints.childNodes[this.selectedHint=b],d.className+=" "+m,d.offsetTopthis.hints.scrollTop+this.hints.clientHeight&&(this.hints.scrollTop=d.offsetTop+d.offsetHeight-this.hints.clientHeight+3),a.signal(this.data,"select",this.data.list[this.selectedHint],d)}},screenAmount:function(){return Math.floor(this.hints.clientHeight/this.hints.firstChild.offsetHeight)||1}},a.registerHelper("hint","auto",{resolve:k}),a.registerHelper("hint","fromList",(function(b,c){var d=b.getCursor(),e=b.getTokenAt(d),f=a.Pos(d.line,e.end);if(e.string&&/\w/.test(e.string[e.string.length-1]))var g=e.string,h=a.Pos(d.line,e.start);else var g="",h=f;for(var i=[],j=0;j,]/,closeOnUnfocus:!0,completeOnSingleClick:!0,container:null,customKeys:null,extraKeys:null};a.defineOption("hintOptions",null)}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/hint/sql-hint.min.js b/media/editors/codemirror/addon/hint/sql-hint.min.js
index 82ca2bac40353..435286522a8cf 100644
--- a/media/editors/codemirror/addon/hint/sql-hint.min.js
+++ b/media/editors/codemirror/addon/hint/sql-hint.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../mode/sql/sql")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../mode/sql/sql"],a):a(CodeMirror)}(function(a){"use strict";function b(a){return"[object Array]"==Object.prototype.toString.call(a)}function c(b){var c=b.doc.modeOption;return"sql"===c&&(c="text/x-sql"),a.resolveMode(c).keywords}function d(a){return"string"==typeof a?a:a.text}function e(a,c){return b(c)&&(c={columns:c}),c.text||(c.text=a),c}function f(a){var c={};if(b(a))for(var f=a.length-1;f>=0;f--){var g=a[f];c[d(g).toUpperCase()]=e(d(g),g)}else if(a)for(var h in a)c[h.toUpperCase()]=e(h,a[h]);return c}function g(a){return p[a.toUpperCase()]}function h(a){var b={};for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function i(a,b){var c=a.length,e=d(b).substr(0,c);return a.toUpperCase()===e.toUpperCase()}function j(a,c,d,e){if(b(d))for(var f=0;f0)&&u(m,i[o])<=0){j={start:l,end:i[o]};break}l=i[o]}for(var p=c.getRange(j.start,j.end,!1),o=0;ol.ch&&(s.end=l.ch,s.string=s.string.slice(0,l.ch-s.start)),s.string.match(/^[.`\w@]\w*$/)?(k=s.string,h=s.start,i=s.end):(h=i=l.ch,k=""),"."==k.charAt(0)||"`"==k.charAt(0)?h=m(l,s,n,a):(j(n,k,p,function(a){return a}),j(n,k,q,function(a){return a}),e||j(n,k,r,function(a){return a.toUpperCase()})),{list:n,from:t(l.line,h),to:t(l.line,i)}})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../mode/sql/sql")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../mode/sql/sql"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return"[object Array]"==Object.prototype.toString.call(a)}function c(b){var c=b.doc.modeOption;return"sql"===c&&(c="text/x-sql"),a.resolveMode(c).keywords}function d(a){return"string"==typeof a?a:a.text}function e(a,c){return b(c)&&(c={columns:c}),c.text||(c.text=a),c}function f(a){var c={};if(b(a))for(var f=a.length-1;f>=0;f--){var g=a[f];c[d(g).toUpperCase()]=e(d(g),g)}else if(a)for(var h in a)c[h.toUpperCase()]=e(h,a[h]);return c}function g(a){return p[a.toUpperCase()]}function h(a){var b={};for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function i(a,b){var c=a.length,e=d(b).substr(0,c);return a.toUpperCase()===e.toUpperCase()}function j(a,c,d,e){if(b(d))for(var f=0;f0)&&u(m,i[o])<=0){j={start:l,end:i[o]};break}l=i[o]}for(var p=c.getRange(j.start,j.end,!1),o=0;ol.ch&&(s.end=l.ch,s.string=s.string.slice(0,l.ch-s.start)),s.string.match(/^[.`\w@]\w*$/)?(k=s.string,h=s.start,i=s.end):(h=i=l.ch,k=""),"."==k.charAt(0)||"`"==k.charAt(0)?h=m(l,s,n,a):(j(n,k,p,(function(a){return a})),j(n,k,q,(function(a){return a})),e||j(n,k,r,(function(a){return a.toUpperCase()}))),{list:n,from:t(l.line,h),to:t(l.line,i)}}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/hint/xml-hint.min.js b/media/editors/codemirror/addon/hint/xml-hint.min.js
index 3ea0a6efcaba4..ab6e4d1dcd354 100644
--- a/media/editors/codemirror/addon/hint/xml-hint.min.js
+++ b/media/editors/codemirror/addon/hint/xml-hint.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";function b(b,d){var e=d&&d.schemaInfo,f=d&&d.quoteChar||'"';if(e){var g=b.getCursor(),h=b.getTokenAt(g);h.end>g.ch&&(h.end=g.ch,h.string=h.string.slice(0,g.ch-h.start));var i=a.innerMode(b.getMode(),h.state);if("xml"==i.mode.name){var j,k,l=[],m=!1,n=/\btag\b/.test(h.type)&&!/>$/.test(h.string),o=n&&/^\w/.test(h.string);if(o){var p=b.getLine(g.line).slice(Math.max(0,h.start-2),h.start),q=/<\/$/.test(p)?"close":/<$/.test(p)?"open":null;q&&(k=h.start-("close"==q?2:1))}else n&&"<"==h.string?q="open":n&&"")}else{var s=e[i.state.tagName],w=s&&s.attrs,x=e["!attrs"];if(!w&&!x)return;if(w){if(x){var y={};for(var z in x)x.hasOwnProperty(z)&&(y[z]=x[z]);for(var z in w)w.hasOwnProperty(z)&&(y[z]=w[z]);w=y}}else w=x;if("string"==h.type||"="==h.string){var A,p=b.getRange(c(g.line,Math.max(0,g.ch-60)),c(g.line,"string"==h.type?h.start:h.end)),B=p.match(/([^\s\u00a0=<>\"\']+)=$/);if(!B||!w.hasOwnProperty(B[1])||!(A=w[B[1]]))return;if("function"==typeof A&&(A=A.call(this,b)),"string"==h.type){j=h.string;var C=0;/['"]/.test(h.string.charAt(0))&&(f=h.string.charAt(0),j=h.string.slice(1),C++);var D=h.string.length;/['"]/.test(h.string.charAt(D-1))&&(f=h.string.charAt(D-1),j=h.string.substr(C,D-2)),m=!0}for(var u=0;ug.ch&&(h.end=g.ch,h.string=h.string.slice(0,g.ch-h.start));var i=a.innerMode(b.getMode(),h.state);if("xml"==i.mode.name){var j,k,l=[],m=!1,n=/\btag\b/.test(h.type)&&!/>$/.test(h.string),o=n&&/^\w/.test(h.string);if(o){var p=b.getLine(g.line).slice(Math.max(0,h.start-2),h.start),q=/<\/$/.test(p)?"close":/<$/.test(p)?"open":null;q&&(k=h.start-("close"==q?2:1))}else n&&"<"==h.string?q="open":n&&"")}else{var s=e[i.state.tagName],w=s&&s.attrs,x=e["!attrs"];if(!w&&!x)return;if(w){if(x){var y={};for(var z in x)x.hasOwnProperty(z)&&(y[z]=x[z]);for(var z in w)w.hasOwnProperty(z)&&(y[z]=w[z]);w=y}}else w=x;if("string"==h.type||"="==h.string){var A,p=b.getRange(c(g.line,Math.max(0,g.ch-60)),c(g.line,"string"==h.type?h.start:h.end)),B=p.match(/([^\s\u00a0=<>\"\']+)=$/);if(!B||!w.hasOwnProperty(B[1])||!(A=w[B[1]]))return;if("function"==typeof A&&(A=A.call(this,b)),"string"==h.type){j=h.string;var C=0;/['"]/.test(h.string.charAt(0))&&(f=h.string.charAt(0),j=h.string.slice(1),C++);var D=h.string.length;/['"]/.test(h.string.charAt(D-1))&&(f=h.string.charAt(D-1),j=h.string.substr(C,D-2)),m=!0}for(var u=0;u0){var k=f.character;i.forEach(function(a){k>a&&(k-=1)}),f.character=k}}var l=f.character-1,m=l+1;f.evidence&&(h=f.evidence.substring(l).search(/.\b/),h>-1&&(m+=h)),f.description=f.reason,f.start=f.character,f.end=m,f=c(f),f&&d.push({message:f.description,severity:f.severity,from:a.Pos(f.line-1,l),to:a.Pos(f.line-1,m)})}}}var g=["Dangerous comment"],h=[["Expected '{'","Statement body should be inside '{ }' braces."]],i=["Missing semicolon","Extra comma","Missing property name","Unmatched "," and instead saw"," is not defined","Unclosed string","Stopping, unable to continue"];a.registerHelper("lint","javascript",b)});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){if(!window.JSHINT)return[];JSHINT(a,b,b.globals);var c=JSHINT.data().errors,d=[];return c&&f(c,d),d}function c(a){return d(a,h,"warning",!0),d(a,i,"error"),e(a)?null:a}function d(a,b,c,d){var e,f,g,h,i;e=a.description;for(var j=0;j0){var k=f.character;i.forEach((function(a){k>a&&(k-=1)})),f.character=k}}var l=f.character-1,m=l+1;f.evidence&&(h=f.evidence.substring(l).search(/.\b/),h>-1&&(m+=h)),f.description=f.reason,f.start=f.character,f.end=m,f=c(f),f&&d.push({message:f.description,severity:f.severity,from:a.Pos(f.line-1,l),to:a.Pos(f.line-1,m)})}}}var g=["Dangerous comment"],h=[["Expected '{'","Statement body should be inside '{ }' braces."]],i=["Missing semicolon","Extra comma","Missing property name","Unmatched "," and instead saw"," is not defined","Unclosed string","Stopping, unable to continue"];a.registerHelper("lint","javascript",b)}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/lint/json-lint.min.js b/media/editors/codemirror/addon/lint/json-lint.min.js
index dcba6fb002f8d..a382f4390a7de 100644
--- a/media/editors/codemirror/addon/lint/json-lint.min.js
+++ b/media/editors/codemirror/addon/lint/json-lint.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";a.registerHelper("lint","json",function(b){var c=[];jsonlint.parseError=function(b,d){var e=d.loc;c.push({from:a.Pos(e.first_line-1,e.first_column),to:a.Pos(e.last_line-1,e.last_column),message:b})};try{jsonlint.parse(b)}catch(d){}return c})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","json",(function(b){var c=[];jsonlint.parseError=function(b,d){var e=d.loc;c.push({from:a.Pos(e.first_line-1,e.first_column),to:a.Pos(e.last_line-1,e.last_column),message:b})};try{jsonlint.parse(b)}catch(a){}return c}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/lint/lint.min.js b/media/editors/codemirror/addon/lint/lint.min.js
index 7bed8e9b9ee2e..c1715f8cceeae 100644
--- a/media/editors/codemirror/addon/lint/lint.min.js
+++ b/media/editors/codemirror/addon/lint/lint.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";function b(b,c){function d(b){return e.parentNode?(e.style.top=Math.max(0,b.clientY-e.offsetHeight-5)+"px",void(e.style.left=b.clientX+5+"px")):a.off(document,"mousemove",d)}var e=document.createElement("div");return e.className="CodeMirror-lint-tooltip",e.appendChild(c.cloneNode(!0)),document.body.appendChild(e),a.on(document,"mousemove",d),d(b),null!=e.style.opacity&&(e.style.opacity=1),e}function c(a){a.parentNode&&a.parentNode.removeChild(a)}function d(a){a.parentNode&&(null==a.style.opacity&&c(a),a.style.opacity=0,setTimeout(function(){c(a)},600))}function e(c,e,f){function g(){a.off(f,"mouseout",g),h&&(d(h),h=null)}var h=b(c,e),i=setInterval(function(){if(h)for(var a=f;;a=a.parentNode){if(a&&11==a.nodeType&&(a=a.host),a==document.body)return;if(!a){g();break}}return h?void 0:clearInterval(i)},400);a.on(f,"mouseout",g)}function f(a,b,c){this.marked=[],this.options=b,this.timeout=null,this.hasGutter=c,this.onMouseOver=function(b){r(a,b)},this.waitingFor=0}function g(a,b){return b instanceof Function?{getAnnotations:b}:(b&&b!==!0||(b={}),b)}function h(a){var b=a.state.lint;b.hasGutter&&a.clearGutter(s);for(var c=0;c1,c.options.tooltips))}}d.onUpdateLinting&&d.onUpdateLinting(b,e,a)}function p(a){var b=a.state.lint;b&&(clearTimeout(b.timeout),b.timeout=setTimeout(function(){n(a)},b.options.delay||500))}function q(a,b){for(var c=b.target||b.srcElement,d=document.createDocumentFragment(),f=0;f1,c.options.tooltips))}}d.onUpdateLinting&&d.onUpdateLinting(b,e,a)}function p(a){var b=a.state.lint;b&&(clearTimeout(b.timeout),b.timeout=setTimeout((function(){n(a)}),b.options.delay||500))}function q(a,b){for(var c=b.target||b.srcElement,d=document.createDocumentFragment(),f=0;fe)return!1;var f=c.getScrollInfo();if("align"==a.mv.options.connect)q=f.top;else{var h,i,j=.5*f.clientHeight,k=f.top+j,l=c.lineAtHeight(k,"local"),m=z(a.chunks,l,b==DIFF_INSERT),n=g(c,b==DIFF_INSERT?m.edit:m.orig),o=g(d,b==DIFF_INSERT?m.orig:m.edit),p=(k-n.top)/(n.bot-n.top),q=o.top-j+p*(o.bot-o.top);if(q>f.top&&(i=f.top/j)<1)q=q*i+f.top*(1-i);else if((h=f.height-f.clientHeight-f.top)h&&(i=h/j)<1&&(q=q*i+(r.height-r.clientHeight-h)*(1-i))}}return d.scrollTo(f.left,q),d.state.scrollSetAt=e,d.state.scrollSetBy=a,!0}function g(a,b){var c=b.after;return null==c&&(c=a.lastLine()+1),{top:a.heightAtLine(b.before||0,"local"),bot:a.heightAtLine(c,"local")}}function h(a,b,c){a.lockScroll=b,b&&0!=c&&f(a,DIFF_INSERT)&&l(a),a.lockButton.innerHTML=b?"⇛⇚":"⇛ ⇚"}function i(b,c,d){for(var e=0;e20||c.from-f.to>20?(i(a,c.marked,e),k(a,b,d,c.marked,f.from,f.to,e),c.from=f.from,c.to=f.to):(f.fromc.to&&(k(a,b,d,c.marked,c.to,f.to,e),c.to=f.to))})}function k(a,b,c,d,e,f,g){function h(b,c){for(var h=Math.max(e,b),i=Math.min(f,c),j=h;i>j;++j){var k=a.addLineClass(j,"background",g.chunk);j==b&&a.addLineClass(k,"background",g.start),j==c-1&&a.addLineClass(k,"background",g.end),d.push(k)}b==c&&h==c&&i==c&&(h?d.push(a.addLineClass(h-1,"background",g.end)):d.push(a.addLineClass(h,"background",g.start)))}for(var i=P(0,0),j=P(e,0),k=a.clipPos(P(f-1)),l=c==DIFF_DELETE?g.del:g.insert,m=0,n=0;nr&&(n&&h(m,r),m=s)}else if(p==c){var t=I(i,q,!0),u=K(j,i),v=J(k,t);L(u,v)||d.push(a.markText(u,v,{className:l})),i=t}}m<=i.line&&h(m,i.line+1)}function l(a){if(a.showDifferences){if(a.svg){F(a.svg);var b=a.gap.offsetWidth;G(a.svg,"width",b,"height",a.gap.offsetHeight)}a.copyButtons&&F(a.copyButtons);for(var c=a.edit.getViewport(),d=a.orig.getViewport(),e=a.mv.wrap.getBoundingClientRect().top,f=e-a.edit.getScrollerElement().getBoundingClientRect().top+a.edit.getScrollInfo().top,g=e-a.orig.getScrollerElement().getBoundingClientRect().top+a.orig.getScrollInfo().top,h=0;h=c.from&&i.origFrom<=d.to&&i.origTo>=d.from&&r(a,i,g,f,b)}}}function m(a,b){for(var c=0,d=0,e=0;ea&&f.editFrom<=a)return null;if(f.editFrom>a)break;c=f.editTo,d=f.origTo}return d+(a-c)}function n(a,b){for(var c=[],d=0;de.editTo)break}f>-1&&c.splice(f-1,0,[m(e.editTo,a.chunks),e.editTo,e.origTo])}return c}function o(a,b){if(a.dealigned||b){if(!a.orig.curOp)return a.orig.operation(function(){o(a,b)});a.dealigned=!1;var d=a.mv.left==a?a.mv.right:a.mv.left;d&&(c(d),d.dealigned=!1);for(var e=n(a,d),f=a.mv.aligners,g=0;g1&&c.push(q(a[f],b[f],h))}}function q(a,b,c){var d=!0;b>a.lastLine()&&(b--,d=!1);var e=document.createElement("div");return e.className="CodeMirror-merge-spacer",e.style.height=c+"px",e.style.minWidth="1px",a.addLineWidget(b,e,{height:c,above:d})}function r(a,b,c,d,e){var f="left"==a.type,g=a.orig.heightAtLine(b.origFrom,"local")-c;if(a.svg){var h=g,i=a.edit.heightAtLine(b.editFrom,"local")-d;if(f){var j=h;h=i,i=j}var k=a.orig.heightAtLine(b.origTo,"local")-c,l=a.edit.heightAtLine(b.editTo,"local")-d;if(f){var j=k;k=l,l=j}var m=" C "+e/2+" "+i+" "+e/2+" "+h+" "+(e+2)+" "+h,n=" C "+e/2+" "+k+" "+e/2+" "+l+" -1 "+l;G(a.svg.appendChild(document.createElementNS(Q,"path")),"d","M -1 "+i+m+" L "+(e+2)+" "+k+n+" z","class",a.classes.connect)}if(a.copyButtons){var o=a.copyButtons.appendChild(E("div","left"==a.type?"â‡":"⇜","CodeMirror-merge-copy")),p=a.mv.options.allowEditingOriginals;if(o.title=p?"Push to left":"Revert chunk",o.chunk=b,o.style.top=g+"px",p){var q=a.orig.heightAtLine(b.editFrom,"local")-d,r=a.copyButtons.appendChild(E("div","right"==a.type?"â‡":"⇜","CodeMirror-merge-copy-reverse"));r.title="Push to right",r.chunk={editFrom:b.origFrom,editTo:b.origTo,origFrom:b.editFrom,origTo:b.editTo},r.style.top=q+"px","right"==a.type?r.style.left="2px":r.style.right="2px"}}}function s(a,b,c,d){if(!a.diffOutOfDate){var e=d.editTo>b.lastLine()?P(d.editFrom-1):P(d.editFrom,0),f=d.origTo>c.lastLine()?P(d.origFrom-1):P(d.origFrom,0);b.replaceRange(c.getRange(f,P(d.origTo,0)),e,P(d.editTo,0))}}function t(b){var c=b.lockButton=E("div",null,"CodeMirror-merge-scrolllock");c.title="Toggle locked scrolling";var d=E("div",[c],"CodeMirror-merge-scrolllock-wrap");a.on(c,"click",function(){h(b,!b.lockScroll)});var e=[d];if(b.mv.options.revertButtons!==!1&&(b.copyButtons=E("div",null,"CodeMirror-merge-copybuttons-"+b.type),a.on(b.copyButtons,"click",function(a){var c=a.target||a.srcElement;if(c.chunk)return"CodeMirror-merge-copy-reverse"==c.className?void s(b,b.orig,b.edit,c.chunk):void s(b,b.edit,b.orig,c.chunk)}),e.unshift(b.copyButtons)),"align"!=b.mv.options.connect){var f=document.createElementNS&&document.createElementNS(Q,"svg");f&&!f.createSVGRect&&(f=null),b.svg=f,f&&e.push(f)}return b.gap=E("div",e,"CodeMirror-merge-gap")}function u(a){return"string"==typeof a?a:a.getValue()}function v(a,b){var c=T.diff_main(a,b);T.diff_cleanupSemantic(c);for(var d=0;dk&&(g&&b.push({origFrom:d,origTo:l,editFrom:c,editTo:k}),c=n,d=o)}else I(i==DIFF_INSERT?e:f,h[1])}return(c<=e.line||d<=f.line)&&b.push({origFrom:d,origTo:f.line+1,editFrom:c,editTo:e.line+1}),b}function x(a,b){if(b==a.length-1)return!0;var c=a[b+1][1];return 1==c.length||10!=c.charCodeAt(0)?!1:b==a.length-2?!0:(c=a[b+2][1],c.length>1&&10==c.charCodeAt(0))}function y(a,b){if(0==b)return!0;var c=a[b-1][1];return 10!=c.charCodeAt(c.length-1)?!1:1==b?!0:(c=a[b-2][1],10==c.charCodeAt(c.length-1))}function z(a,b,c){for(var d,e,f,g,h=0;hb?(e=i.editFrom,g=i.origFrom):k>b&&(e=i.editTo,g=i.origTo)),b>=k?(d=i.editTo,f=i.origTo):b>=j&&(d=i.editFrom,f=i.origFrom)}return{edit:{before:d,after:e},orig:{before:f,after:g}}}function A(b,c,d){function e(){g.clear(),b.removeLineClass(c,"wrap","CodeMirror-merge-collapsed-line")}b.addLineClass(c,"wrap","CodeMirror-merge-collapsed-line");var f=document.createElement("span");f.className="CodeMirror-merge-collapsed-widget",f.title="Identical text collapsed. Click to expand.";var g=b.markText(P(c,0),P(d-1),{inclusiveLeft:!0,inclusiveRight:!0,replacedWith:f,clearOnEnter:!0});return a.on(f,"click",e),{mark:g,clear:e}}function B(a,b){function c(){for(var a=0;a=0&&h=f;f++)c.push(!0);a.left&&C(a.left,b,e,c),a.right&&C(a.right,b,e,c);for(var h=0;hb){var k=[{line:i,cm:d}];a.left&&k.push({line:m(i,a.left.chunks),cm:a.left.orig}),a.right&&k.push({line:m(i,a.right.chunks),cm:a.right.orig});var l=B(j,k);a.options.onCollapse&&a.options.onCollapse(a,i,j,l)}}}function E(a,b,c,d){var e=document.createElement(a);if(c&&(e.className=c),d&&(e.style.cssText=d),"string"==typeof b)e.appendChild(document.createTextNode(b));else if(b)for(var f=0;f0;--b)a.removeChild(a.firstChild)}function G(a){for(var b=1;b0?a:b}function L(a,b){return a.line==b.line&&a.ch==b.ch}function M(a,b,c){for(var d=a.length-1;d>=0;d--){var e=a[d],f=(c?e.origTo:e.editTo)-1;if(b>f)return f}}function N(a,b,c){for(var d=0;db)return f}}function O(b,d){var e=null,f=b.state.diffViews,g=b.getCursor().line;if(f)for(var h=0;hd?M(i.chunks,g,j):N(i.chunks,g,j);null==k||null!=e&&!(0>d?k>e:e>k)||(e=k)}return null==e?a.Pass:void b.setCursor(e,0)}var P=a.Pos,Q="http://www.w3.org/2000/svg";b.prototype={constructor:b,init:function(b,c,f){this.edit=this.mv.edit,(this.edit.state.diffViews||(this.edit.state.diffViews=[])).push(this),this.orig=a(b,H({value:c,readOnly:!this.mv.options.allowEditingOriginals},H(f))),this.orig.state.diffViews=[this],this.diff=v(u(c),u(f.value)),this.chunks=w(this.diff),this.diffOutOfDate=this.dealigned=!1,this.showDifferences=f.showDifferences!==!1,this.forceUpdate=d(this),h(this,!0,!1),e(this)},setShowDifferences:function(a){a=a!==!1,a!=this.showDifferences&&(this.showDifferences=a,this.forceUpdate("full"))}};var R=!1,S=a.MergeView=function(c,d){if(!(this instanceof S))return new S(c,d);this.options=d;var e=d.origLeft,f=null==d.origRight?d.orig:d.origRight,g=null!=e,h=null!=f,i=1+(g?1:0)+(h?1:0),j=[],k=this.left=null,m=this.right=null,n=this;if(g){k=this.left=new b(this,"left");var p=E("div",null,"CodeMirror-merge-pane");j.push(p),j.push(t(k))}var q=E("div",null,"CodeMirror-merge-pane");if(j.push(q),h){m=this.right=new b(this,"right"),j.push(t(m));var r=E("div",null,"CodeMirror-merge-pane");j.push(r)}(h?r:q).className+=" CodeMirror-merge-pane-rightmost",j.push(E("div",null,null,"height: 0; clear: both;"));var s=this.wrap=c.appendChild(E("div",j,"CodeMirror-merge CodeMirror-merge-"+i+"pane"));this.edit=a(q,H(d)),k&&k.init(p,e,d),m&&m.init(r,f,d),d.collapseIdentical&&this.editor().operation(function(){D(n,d.collapseIdentical)}),"align"==d.connect&&(this.aligners=[],o(this.left||this.right,!0));var u=function(){k&&l(k),m&&l(m)};a.on(window,"resize",u);var v=setInterval(function(){for(var b=s.parentNode;b&&b!=document.body;b=b.parentNode);b||(clearInterval(v),a.off(window,"resize",u))},5e3)};S.prototype={constuctor:S,editor:function(){return this.edit},rightOriginal:function(){return this.right&&this.right.orig},leftOriginal:function(){return this.left&&this.left.orig},setShowDifferences:function(a){this.right&&this.right.setShowDifferences(a),this.left&&this.left.setShowDifferences(a)},rightChunks:function(){return this.right?(c(this.right),this.right.chunks):void 0},leftChunks:function(){return this.left?(c(this.left),this.left.chunks):void 0}};var T=new diff_match_patch;a.commands.goNextDiff=function(a){return O(a,1)},a.commands.goPrevDiff=function(a){return O(a,-1)}});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","diff_match_patch"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){this.mv=a,this.type=b,this.classes="left"==b?{chunk:"CodeMirror-merge-l-chunk",start:"CodeMirror-merge-l-chunk-start",end:"CodeMirror-merge-l-chunk-end",insert:"CodeMirror-merge-l-inserted",del:"CodeMirror-merge-l-deleted",connect:"CodeMirror-merge-l-connect"}:{chunk:"CodeMirror-merge-r-chunk",start:"CodeMirror-merge-r-chunk-start",end:"CodeMirror-merge-r-chunk-end",insert:"CodeMirror-merge-r-inserted",del:"CodeMirror-merge-r-deleted",connect:"CodeMirror-merge-r-connect"}}function c(b){b.diffOutOfDate&&(b.diff=v(b.orig.getValue(),b.edit.getValue()),b.chunks=w(b.diff),b.diffOutOfDate=!1,a.signal(b.edit,"updateDiff",b.diff))}function d(a){function b(b){R=!0,m=!1,"full"==b&&(a.svg&&F(a.svg),a.copyButtons&&F(a.copyButtons),i(a.edit,h.marked,a.classes),i(a.orig,k.marked,a.classes),h.from=h.to=k.from=k.to=0),c(a),a.showDifferences&&(j(a.edit,a.diff,h,DIFF_INSERT,a.classes),j(a.orig,a.diff,k,DIFF_DELETE,a.classes)),l(a),"align"==a.mv.options.connect&&o(a),R=!1}function d(b){R||(a.dealigned=!0,e(b))}function e(a){R||m||(clearTimeout(g),a===!0&&(m=!0),g=setTimeout(b,a===!0?20:250))}function f(b,c){a.diffOutOfDate||(a.diffOutOfDate=!0,h.from=h.to=k.from=k.to=0),d(c.text.length-1!=c.to.line-c.from.line)}var g,h={from:0,to:0,marked:[]},k={from:0,to:0,marked:[]},m=!1;return a.edit.on("change",f),a.orig.on("change",f),a.edit.on("markerAdded",d),a.edit.on("markerCleared",d),a.orig.on("markerAdded",d),a.orig.on("markerCleared",d),a.edit.on("viewportChange",(function(){e(!1)})),a.orig.on("viewportChange",(function(){e(!1)})),b(),b}function e(a){a.edit.on("scroll",(function(){f(a,DIFF_INSERT)&&l(a)})),a.orig.on("scroll",(function(){f(a,DIFF_DELETE)&&l(a)}))}function f(a,b){if(a.diffOutOfDate)return!1;if(!a.lockScroll)return!0;var c,d,e=+new Date;if(b==DIFF_INSERT?(c=a.edit,d=a.orig):(c=a.orig,d=a.edit),c.state.scrollSetBy==a&&(c.state.scrollSetAt||0)+50>e)return!1;var f=c.getScrollInfo();if("align"==a.mv.options.connect)q=f.top;else{var h,i,j=.5*f.clientHeight,k=f.top+j,l=c.lineAtHeight(k,"local"),m=z(a.chunks,l,b==DIFF_INSERT),n=g(c,b==DIFF_INSERT?m.edit:m.orig),o=g(d,b==DIFF_INSERT?m.orig:m.edit),p=(k-n.top)/(n.bot-n.top),q=o.top-j+p*(o.bot-o.top);if(q>f.top&&(i=f.top/j)<1)q=q*i+f.top*(1-i);else if((h=f.height-f.clientHeight-f.top)h&&(i=h/j)<1&&(q=q*i+(r.height-r.clientHeight-h)*(1-i))}}return d.scrollTo(f.left,q),d.state.scrollSetAt=e,d.state.scrollSetBy=a,!0}function g(a,b){var c=b.after;return null==c&&(c=a.lastLine()+1),{top:a.heightAtLine(b.before||0,"local"),bot:a.heightAtLine(c,"local")}}function h(a,b,c){a.lockScroll=b,b&&0!=c&&f(a,DIFF_INSERT)&&l(a),a.lockButton.innerHTML=b?"⇛⇚":"⇛ ⇚"}function i(b,c,d){for(var e=0;e20||c.from-f.to>20?(i(a,c.marked,e),k(a,b,d,c.marked,f.from,f.to,e),c.from=f.from,c.to=f.to):(f.fromc.to&&(k(a,b,d,c.marked,c.to,f.to,e),c.to=f.to))}))}function k(a,b,c,d,e,f,g){function h(b,c){for(var h=Math.max(e,b),i=Math.min(f,c),j=h;jr&&(n&&h(m,r),m=s)}else if(p==c){var t=I(i,q,!0),u=K(j,i),v=J(k,t);L(u,v)||d.push(a.markText(u,v,{className:l})),i=t}}m<=i.line&&h(m,i.line+1)}function l(a){if(a.showDifferences){if(a.svg){F(a.svg);var b=a.gap.offsetWidth;G(a.svg,"width",b,"height",a.gap.offsetHeight)}a.copyButtons&&F(a.copyButtons);for(var c=a.edit.getViewport(),d=a.orig.getViewport(),e=a.mv.wrap.getBoundingClientRect().top,f=e-a.edit.getScrollerElement().getBoundingClientRect().top+a.edit.getScrollInfo().top,g=e-a.orig.getScrollerElement().getBoundingClientRect().top+a.orig.getScrollInfo().top,h=0;h=c.from&&i.origFrom<=d.to&&i.origTo>=d.from&&r(a,i,g,f,b)}}}function m(a,b){for(var c=0,d=0,e=0;ea&&f.editFrom<=a)return null;if(f.editFrom>a)break;c=f.editTo,d=f.origTo}return d+(a-c)}function n(a,b){for(var c=[],d=0;de.editTo)break}f>-1&&c.splice(f-1,0,[m(e.editTo,a.chunks),e.editTo,e.origTo])}return c}function o(a,b){if(a.dealigned||b){if(!a.orig.curOp)return a.orig.operation((function(){o(a,b)}));a.dealigned=!1;var d=a.mv.left==a?a.mv.right:a.mv.left;d&&(c(d),d.dealigned=!1);for(var e=n(a,d),f=a.mv.aligners,g=0;g1&&c.push(q(a[f],b[f],h))}}function q(a,b,c){var d=!0;b>a.lastLine()&&(b--,d=!1);var e=document.createElement("div");return e.className="CodeMirror-merge-spacer",e.style.height=c+"px",e.style.minWidth="1px",a.addLineWidget(b,e,{height:c,above:d})}function r(a,b,c,d,e){var f="left"==a.type,g=a.orig.heightAtLine(b.origFrom,"local")-c;if(a.svg){var h=g,i=a.edit.heightAtLine(b.editFrom,"local")-d;if(f){var j=h;h=i,i=j}var k=a.orig.heightAtLine(b.origTo,"local")-c,l=a.edit.heightAtLine(b.editTo,"local")-d;if(f){var j=k;k=l,l=j}var m=" C "+e/2+" "+i+" "+e/2+" "+h+" "+(e+2)+" "+h,n=" C "+e/2+" "+k+" "+e/2+" "+l+" -1 "+l;G(a.svg.appendChild(document.createElementNS(Q,"path")),"d","M -1 "+i+m+" L "+(e+2)+" "+k+n+" z","class",a.classes.connect)}if(a.copyButtons){var o=a.copyButtons.appendChild(E("div","left"==a.type?"â‡":"⇜","CodeMirror-merge-copy")),p=a.mv.options.allowEditingOriginals;if(o.title=p?"Push to left":"Revert chunk",o.chunk=b,o.style.top=g+"px",p){var q=a.orig.heightAtLine(b.editFrom,"local")-d,r=a.copyButtons.appendChild(E("div","right"==a.type?"â‡":"⇜","CodeMirror-merge-copy-reverse"));r.title="Push to right",r.chunk={editFrom:b.origFrom,editTo:b.origTo,origFrom:b.editFrom,origTo:b.editTo},r.style.top=q+"px","right"==a.type?r.style.left="2px":r.style.right="2px"}}}function s(a,b,c,d){if(!a.diffOutOfDate){var e=d.editTo>b.lastLine()?P(d.editFrom-1):P(d.editFrom,0),f=d.origTo>c.lastLine()?P(d.origFrom-1):P(d.origFrom,0);b.replaceRange(c.getRange(f,P(d.origTo,0)),e,P(d.editTo,0))}}function t(b){var c=b.lockButton=E("div",null,"CodeMirror-merge-scrolllock");c.title="Toggle locked scrolling";var d=E("div",[c],"CodeMirror-merge-scrolllock-wrap");a.on(c,"click",(function(){h(b,!b.lockScroll)}));var e=[d];if(b.mv.options.revertButtons!==!1&&(b.copyButtons=E("div",null,"CodeMirror-merge-copybuttons-"+b.type),a.on(b.copyButtons,"click",(function(a){var c=a.target||a.srcElement;if(c.chunk)return"CodeMirror-merge-copy-reverse"==c.className?void s(b,b.orig,b.edit,c.chunk):void s(b,b.edit,b.orig,c.chunk)})),e.unshift(b.copyButtons)),"align"!=b.mv.options.connect){var f=document.createElementNS&&document.createElementNS(Q,"svg");f&&!f.createSVGRect&&(f=null),b.svg=f,f&&e.push(f)}return b.gap=E("div",e,"CodeMirror-merge-gap")}function u(a){return"string"==typeof a?a:a.getValue()}function v(a,b){var c=T.diff_main(a,b);T.diff_cleanupSemantic(c);for(var d=0;dk&&(g&&b.push({origFrom:d,origTo:l,editFrom:c,editTo:k}),c=n,d=o)}else I(i==DIFF_INSERT?e:f,h[1])}return(c<=e.line||d<=f.line)&&b.push({origFrom:d,origTo:f.line+1,editFrom:c,editTo:e.line+1}),b}function x(a,b){if(b==a.length-1)return!0;var c=a[b+1][1];return 1!=c.length&&10==c.charCodeAt(0)&&(b==a.length-2||(c=a[b+2][1],c.length>1&&10==c.charCodeAt(0)))}function y(a,b){if(0==b)return!0;var c=a[b-1][1];return 10==c.charCodeAt(c.length-1)&&(1==b||(c=a[b-2][1],10==c.charCodeAt(c.length-1)))}function z(a,b,c){for(var d,e,f,g,h=0;hb?(e=i.editFrom,g=i.origFrom):k>b&&(e=i.editTo,g=i.origTo)),k<=b?(d=i.editTo,f=i.origTo):j<=b&&(d=i.editFrom,f=i.origFrom)}return{edit:{before:d,after:e},orig:{before:f,after:g}}}function A(b,c,d){function e(){g.clear(),b.removeLineClass(c,"wrap","CodeMirror-merge-collapsed-line")}b.addLineClass(c,"wrap","CodeMirror-merge-collapsed-line");var f=document.createElement("span");f.className="CodeMirror-merge-collapsed-widget",f.title="Identical text collapsed. Click to expand.";var g=b.markText(P(c,0),P(d-1),{inclusiveLeft:!0,inclusiveRight:!0,replacedWith:f,clearOnEnter:!0});return a.on(f,"click",e),{mark:g,clear:e}}function B(a,b){function c(){for(var a=0;a=0&&hb){var k=[{line:i,cm:d}];a.left&&k.push({line:m(i,a.left.chunks),cm:a.left.orig}),a.right&&k.push({line:m(i,a.right.chunks),cm:a.right.orig});var l=B(j,k);a.options.onCollapse&&a.options.onCollapse(a,i,j,l)}}}function E(a,b,c,d){var e=document.createElement(a);if(c&&(e.className=c),d&&(e.style.cssText=d),"string"==typeof b)e.appendChild(document.createTextNode(b));else if(b)for(var f=0;f0;--b)a.removeChild(a.firstChild)}function G(a){for(var b=1;b0?a:b}function L(a,b){return a.line==b.line&&a.ch==b.ch}function M(a,b,c){for(var d=a.length-1;d>=0;d--){var e=a[d],f=(c?e.origTo:e.editTo)-1;if(fb)return f}}function O(b,d){var e=null,f=b.state.diffViews,g=b.getCursor().line;if(f)for(var h=0;he:k-1?e+b.length:e}var f=b.exec(c?a.slice(c):a);return f?f.index+c+(d?f[0].length:0):-1}var d=Array.prototype.slice.call(arguments,1);return{startState:function(){return{outer:a.startState(b),innerActive:null,inner:null}},copyState:function(c){return{outer:a.copyState(b,c.outer),innerActive:c.innerActive,inner:c.innerActive&&a.copyState(c.innerActive.mode,c.inner)}},token:function(e,f){if(f.innerActive){var g=f.innerActive,h=e.string;if(!g.close&&e.sol())return f.innerActive=f.inner=null,this.token(e,f);var i=g.close?c(h,g.close,e.pos,g.parseDelimiters):-1;if(i==e.pos&&!g.parseDelimiters)return e.match(g.close),f.innerActive=f.inner=null,g.delimStyle&&g.delimStyle+" "+g.delimStyle+"-close";i>-1&&(e.string=h.slice(0,i));var j=g.mode.token(e,f.inner);return i>-1&&(e.string=h),i==e.pos&&g.parseDelimiters&&(f.innerActive=f.inner=null),g.innerStyle&&(j=j?j+" "+g.innerStyle:g.innerStyle),j}for(var k=1/0,h=e.string,l=0;li&&(k=i)}k!=1/0&&(e.string=h.slice(0,k));var n=b.token(e,f.outer);return k!=1/0&&(e.string=h),n},indent:function(c,d){var e=c.innerActive?c.innerActive.mode:b;return e.indent?e.indent(c.innerActive?c.inner:c.outer,d):a.Pass},blankLine:function(c){var e=c.innerActive?c.innerActive.mode:b;if(e.blankLine&&e.blankLine(c.innerActive?c.inner:c.outer),c.innerActive)"\n"===c.innerActive.close&&(c.innerActive=c.inner=null);else for(var f=0;f-1?e+b.length:e}var f=b.exec(c?a.slice(c):a);return f?f.index+c+(d?f[0].length:0):-1}var d=Array.prototype.slice.call(arguments,1);return{startState:function(){return{outer:a.startState(b),innerActive:null,inner:null}},copyState:function(c){return{outer:a.copyState(b,c.outer),innerActive:c.innerActive,inner:c.innerActive&&a.copyState(c.innerActive.mode,c.inner)}},token:function(e,f){if(f.innerActive){var g=f.innerActive,h=e.string;if(!g.close&&e.sol())return f.innerActive=f.inner=null,this.token(e,f);var i=g.close?c(h,g.close,e.pos,g.parseDelimiters):-1;if(i==e.pos&&!g.parseDelimiters)return e.match(g.close),f.innerActive=f.inner=null,g.delimStyle&&g.delimStyle+" "+g.delimStyle+"-close";i>-1&&(e.string=h.slice(0,i));var j=g.mode.token(e,f.inner);return i>-1&&(e.string=h),i==e.pos&&g.parseDelimiters&&(f.innerActive=f.inner=null),g.innerStyle&&(j=j?j+" "+g.innerStyle:g.innerStyle),j}for(var k=1/0,h=e.string,l=0;l2){d.pending=[];for(var m=2;m-1)return a.Pass;var g=d.indent.length-1,h=b[d.state];a:for(;;){for(var j=0;jg?0:d.indent[g]}}a.defineSimpleMode=function(b,c){a.defineMode(b,function(b){return a.simpleMode(b,c)})},a.simpleMode=function(c,d){b(d,"start");var g={},h=d.meta||{},i=!1;for(var k in d)if(k!=h&&d.hasOwnProperty(k))for(var l=g[k]=[],m=d[k],n=0;n2){d.pending=[];for(var m=2;m-1)return a.Pass;var g=d.indent.length-1,h=b[d.state];a:for(;;){for(var j=0;j=this.string.length},sol:function(){return 0==this.pos},peek:function(){return this.string.charAt(this.pos)||null},next:function(){return this.posb},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);return b>-1?(this.pos=b,!0):void 0},backUp:function(a){this.pos-=a},column:function(){return this.start-this.lineStart},indentation:function(){return 0},match:function(a,b,c){if("string"!=typeof a){var d=this.string.slice(this.pos).match(a);return d&&d.index>0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);return e(f)==e(a)?(b!==!1&&(this.pos+=a.length),!0):void 0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}}},CodeMirror.StringStream=b,CodeMirror.startState=function(a,b,c){return a.startState?a.startState(b,c):!0};var c=CodeMirror.modes={},d=CodeMirror.mimeModes={};CodeMirror.defineMode=function(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),c[a]=b},CodeMirror.defineMIME=function(a,b){d[a]=b},CodeMirror.resolveMode=function(a){return"string"==typeof a&&d.hasOwnProperty(a)?a=d[a]:a&&"string"==typeof a.name&&d.hasOwnProperty(a.name)&&(a=d[a.name]),"string"==typeof a?{name:a}:a||{name:"null"}},CodeMirror.getMode=function(a,b){b=CodeMirror.resolveMode(b);var d=c[b.name];if(!d)throw new Error("Unknown mode: "+b);return d(a,b)},CodeMirror.registerHelper=CodeMirror.registerGlobalHelper=Math.min,CodeMirror.defineMode("null",function(){return{token:function(a){a.skipToEnd()}}}),CodeMirror.defineMIME("text/plain","null"),CodeMirror.runMode=function(b,c,d,e){var f=CodeMirror.getMode({indentUnit:2},c);if(1==d.nodeType){var g=e&&e.tabSize||4,h=d,i=0;h.innerHTML="",d=function(a,b){if("\n"==a)return h.appendChild(document.createElement("br")),void(i=0);for(var c="",d=0;;){var e=a.indexOf(" ",d);if(-1==e){c+=a.slice(d),i+=a.length-d;break}i+=e-d,c+=a.slice(d,e);var f=g-i%g;i+=f;for(var j=0;f>j;++j)c+=" ";d=e+1}if(b){var k=h.appendChild(document.createElement("span"));k.className="cm-"+b.replace(/ +/g," cm-"),k.appendChild(document.createTextNode(c))}else h.appendChild(document.createTextNode(c))}}for(var j=a(b),k=e&&e.state||CodeMirror.startState(f),l=0,m=j.length;m>l;++l){l&&d("\n");var n=new CodeMirror.StringStream(j[l]);for(!n.string&&f.blankLine&&f.blankLine(k);!n.eol();){var o=f.token(n,k);d(n.current(),o,l,n.start,k),n.start=n.pos}}}}();
\ No newline at end of file
+window.CodeMirror={},(function(){"use strict";function a(a){return a.split(/\r?\n|\r/)}function b(a){this.pos=this.start=0,this.string=a,this.lineStart=0}b.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return 0==this.pos},peek:function(){return this.string.charAt(this.pos)||null},next:function(){if(this.posb},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);if(b>-1)return this.pos=b,!0},backUp:function(a){this.pos-=a},column:function(){return this.start-this.lineStart},indentation:function(){return 0},match:function(a,b,c){if("string"!=typeof a){var d=this.string.slice(this.pos).match(a);return d&&d.index>0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);if(e(f)==e(a))return b!==!1&&(this.pos+=a.length),!0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}}},CodeMirror.StringStream=b,CodeMirror.startState=function(a,b,c){return!a.startState||a.startState(b,c)};var c=CodeMirror.modes={},d=CodeMirror.mimeModes={};CodeMirror.defineMode=function(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),c[a]=b},CodeMirror.defineMIME=function(a,b){d[a]=b},CodeMirror.resolveMode=function(a){return"string"==typeof a&&d.hasOwnProperty(a)?a=d[a]:a&&"string"==typeof a.name&&d.hasOwnProperty(a.name)&&(a=d[a.name]),"string"==typeof a?{name:a}:a||{name:"null"}},CodeMirror.getMode=function(a,b){b=CodeMirror.resolveMode(b);var d=c[b.name];if(!d)throw new Error("Unknown mode: "+b);return d(a,b)},CodeMirror.registerHelper=CodeMirror.registerGlobalHelper=Math.min,CodeMirror.defineMode("null",(function(){return{token:function(a){a.skipToEnd()}}})),CodeMirror.defineMIME("text/plain","null"),CodeMirror.runMode=function(b,c,d,e){var f=CodeMirror.getMode({indentUnit:2},c);if(1==d.nodeType){var g=e&&e.tabSize||4,h=d,i=0;h.innerHTML="",d=function(a,b){if("\n"==a)return h.appendChild(document.createElement("br")),void(i=0);for(var c="",d=0;;){var e=a.indexOf("\t",d);if(e==-1){c+=a.slice(d),i+=a.length-d;break}i+=e-d,c+=a.slice(d,e);var f=g-i%g;i+=f;for(var j=0;jg;++g)c+=" ";d=e+1}if(b){var l=j.appendChild(document.createElement("span"));l.className="cm-"+b.replace(/ +/g," cm-"),l.appendChild(document.createTextNode(c))}else j.appendChild(document.createTextNode(c))}}for(var l=a.splitLines(b),m=e&&e.state||a.startState(f),n=0,o=l.length;o>n;++n){n&&d("\n");var p=new a.StringStream(l[n]);for(!p.string&&f.blankLine&&f.blankLine(m);!p.eol();){var q=f.token(p,m);d(p.current(),q,n,p.start,m),p.start=p.pos}}}});var countColumn=function(a,b,c,d,e){null==b&&(b=a.search(/[^\s\u00a0]/),-1==b&&(b=a.length));for(var f=d||0,g=e||0;;){var h=a.indexOf(" ",f);if(0>h||h>=b)return g+(b-f);g+=h-f,g+=c-g%c,f=h+1}};StringStream.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return this.pos==this.lineStart},peek:function(){return this.string.charAt(this.pos)||void 0},next:function(){return this.posb},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);return b>-1?(this.pos=b,!0):void 0},backUp:function(a){this.pos-=a},column:function(){return this.lastColumnPos0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);return e(f)==e(a)?(b!==!1&&(this.pos+=a.length),!0):void 0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}}},exports.StringStream=StringStream,exports.startState=function(a,b,c){return a.startState?a.startState(b,c):!0};var modes=exports.modes={},mimeModes=exports.mimeModes={};exports.defineMode=function(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),modes[a]=b},exports.defineMIME=function(a,b){mimeModes[a]=b},exports.defineMode("null",function(){return{token:function(a){a.skipToEnd()}}}),exports.defineMIME("text/plain","null"),exports.resolveMode=function(a){return"string"==typeof a&&mimeModes.hasOwnProperty(a)?a=mimeModes[a]:a&&"string"==typeof a.name&&mimeModes.hasOwnProperty(a.name)&&(a=mimeModes[a.name]),"string"==typeof a?{name:a}:a||{name:"null"}};var modeExtensions=exports.modeExtensions={};exports.extendMode=function(a,b){var c=modeExtensions.hasOwnProperty(a)?modeExtensions[a]:modeExtensions[a]={};copyObj(b,c)},exports.getMode=function(a,b){var b=exports.resolveMode(b),c=modes[b.name];if(!c)return exports.getMode(a,"text/plain");var d=c(a,b);if(modeExtensions.hasOwnProperty(b.name)){var e=modeExtensions[b.name];for(var f in e)e.hasOwnProperty(f)&&(d.hasOwnProperty(f)&&(d["_"+f]=d[f]),d[f]=e[f])}if(d.name=b.name,b.helperType&&(d.helperType=b.helperType),b.modeProps)for(var f in b.modeProps)d[f]=b.modeProps[f];return d},exports.registerHelper=exports.registerGlobalHelper=Math.min,exports.runMode=function(a,b,c,d){for(var e=exports.getMode({indentUnit:2},b),f=splitLines(a),g=d&&d.state||exports.startState(e),h=0,i=f.length;i>h;++h){h&&c("\n");var j=new exports.StringStream(f[h]);for(!j.string&&e.blankLine&&e.blankLine(g);!j.eol();){var k=e.token(j,g);c(j.current(),k,h,j.start,g),j.start=j.pos}}},require.cache[require.resolve("../../lib/codemirror")]=require.cache[require.resolve("./runmode.node")],require.cache[require.resolve("../../addon/runmode/runmode")]=require.cache[require.resolve("./runmode.node")];
\ No newline at end of file
+function splitLines(a){return a.split(/\r\n?|\n/)}function StringStream(a,b){this.pos=this.start=0,this.string=a,this.tabSize=b||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0}function copyObj(a,b,c){b||(b={});for(var d in a)!a.hasOwnProperty(d)||c===!1&&b.hasOwnProperty(d)||(b[d]=a[d]);return b}!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.runMode=function(b,c,d,e){var f=a.getMode(a.defaults,c),g=/MSIE \d/.test(navigator.userAgent),h=g&&(null==document.documentMode||document.documentMode<9);if(d.appendChild){var i=e&&e.tabSize||a.defaults.tabSize,j=d,k=0;j.innerHTML="",d=function(a,b){if("\n"==a)return j.appendChild(document.createTextNode(h?"\r":a)),void(k=0);for(var c="",d=0;;){var e=a.indexOf("\t",d);if(e==-1){c+=a.slice(d),k+=a.length-d;break}k+=e-d,c+=a.slice(d,e);var f=i-k%i;k+=f;for(var g=0;g=b)return g+(b-f);g+=h-f,g+=c-g%c,f=h+1}};StringStream.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return this.pos==this.lineStart},peek:function(){return this.string.charAt(this.pos)||void 0},next:function(){if(this.posb},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);if(b>-1)return this.pos=b,!0},backUp:function(a){this.pos-=a},column:function(){return this.lastColumnPos0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);if(e(f)==e(a))return b!==!1&&(this.pos+=a.length),!0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}}},exports.StringStream=StringStream,exports.startState=function(a,b,c){return!a.startState||a.startState(b,c)};var modes=exports.modes={},mimeModes=exports.mimeModes={};exports.defineMode=function(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),modes[a]=b},exports.defineMIME=function(a,b){mimeModes[a]=b},exports.defineMode("null",(function(){return{token:function(a){a.skipToEnd()}}})),exports.defineMIME("text/plain","null"),exports.resolveMode=function(a){return"string"==typeof a&&mimeModes.hasOwnProperty(a)?a=mimeModes[a]:a&&"string"==typeof a.name&&mimeModes.hasOwnProperty(a.name)&&(a=mimeModes[a.name]),"string"==typeof a?{name:a}:a||{name:"null"}};var modeExtensions=exports.modeExtensions={};exports.extendMode=function(a,b){var c=modeExtensions.hasOwnProperty(a)?modeExtensions[a]:modeExtensions[a]={};copyObj(b,c)},exports.getMode=function(a,b){var b=exports.resolveMode(b),c=modes[b.name];if(!c)return exports.getMode(a,"text/plain");var d=c(a,b);if(modeExtensions.hasOwnProperty(b.name)){var e=modeExtensions[b.name];for(var f in e)e.hasOwnProperty(f)&&(d.hasOwnProperty(f)&&(d["_"+f]=d[f]),d[f]=e[f])}if(d.name=b.name,b.helperType&&(d.helperType=b.helperType),b.modeProps)for(var f in b.modeProps)d[f]=b.modeProps[f];return d},exports.registerHelper=exports.registerGlobalHelper=Math.min,exports.runMode=function(a,b,c,d){for(var e=exports.getMode({indentUnit:2},b),f=splitLines(a),g=d&&d.state||exports.startState(e),h=0,i=f.length;hh)return c.charCoords(a,"local")[b?"top":"bottom"];var d=c.heightAtLine(j,"local");return d+(b?0:j.height)}a!==!1&&this.computeScale();var c=this.cm,d=this.hScale,e=document.createDocumentFragment(),f=this.annotations,g=c.getOption("lineWrapping"),h=g&&1.5*c.defaultTextHeight(),i=null,j=null;if(c.display.barWidth)for(var k,l=0;lo+.9));)m=f[++l],o=b(m.to,!1)*d;if(o!=n){var p=Math.max(o-n,3),q=e.appendChild(document.createElement("div"));q.style.cssText="position: absolute; right: 0px; width: "+Math.max(c.display.barWidth-1,2)+"px; top: "+(n+this.buttonHeight)+"px; height: "+p+"px",q.className=this.options.className,m.id&&q.setAttribute("annotation-id",m.id)}}this.div.textContent="",this.div.appendChild(e)},b.prototype.clear=function(){this.cm.off("refresh",this.resizeHandler),this.cm.off("markerAdded",this.resizeHandler),this.cm.off("markerCleared",this.resizeHandler),this.changeHandler&&this.cm.off("change",this.changeHandler),this.div.parentNode.removeChild(this.div)}});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){function c(a){clearTimeout(d.doRedraw),d.doRedraw=setTimeout((function(){d.redraw()}),a)}this.cm=a,this.options=b,this.buttonHeight=b.scrollButtonHeight||a.getOption("scrollButtonHeight"),this.annotations=[],this.doRedraw=this.doUpdate=null,this.div=a.getWrapperElement().appendChild(document.createElement("div")),this.div.style.cssText="position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none",this.computeScale();var d=this;a.on("refresh",this.resizeHandler=function(){clearTimeout(d.doUpdate),d.doUpdate=setTimeout((function(){d.computeScale()&&c(20)}),100)}),a.on("markerAdded",this.resizeHandler),a.on("markerCleared",this.resizeHandler),b.listenForChanges!==!1&&a.on("change",this.changeHandler=function(){c(250)})}a.defineExtension("annotateScrollbar",(function(a){return"string"==typeof a&&(a={className:a}),new b(this,a)})),a.defineOption("scrollButtonHeight",0),b.prototype.computeScale=function(){var a=this.cm,b=(a.getWrapperElement().clientHeight-a.display.barHeight-2*this.buttonHeight)/a.getScrollerElement().scrollHeight;if(b!=this.hScale)return this.hScale=b,!0},b.prototype.update=function(a){this.annotations=a,this.redraw()},b.prototype.redraw=function(a){function b(a,b){if(i!=a.line&&(i=a.line,j=c.getLineHandle(i)),g&&j.height>h)return c.charCoords(a,"local")[b?"top":"bottom"];var d=c.heightAtLine(j,"local");return d+(b?0:j.height)}a!==!1&&this.computeScale();var c=this.cm,d=this.hScale,e=document.createDocumentFragment(),f=this.annotations,g=c.getOption("lineWrapping"),h=g&&1.5*c.defaultTextHeight(),i=null,j=null;if(c.display.barWidth)for(var k,l=0;lo+.9));)m=f[++l],o=b(m.to,!1)*d;if(o!=n){var p=Math.max(o-n,3),q=e.appendChild(document.createElement("div"));q.style.cssText="position: absolute; right: 0px; width: "+Math.max(c.display.barWidth-1,2)+"px; top: "+(n+this.buttonHeight)+"px; height: "+p+"px",q.className=this.options.className,m.id&&q.setAttribute("annotation-id",m.id)}}this.div.textContent="",this.div.appendChild(e)},b.prototype.clear=function(){this.cm.off("refresh",this.resizeHandler),this.cm.off("markerAdded",this.resizeHandler),this.cm.off("markerCleared",this.resizeHandler),this.changeHandler&&this.cm.off("change",this.changeHandler),this.div.parentNode.removeChild(this.div)}}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/scroll/scrollpastend.min.js b/media/editors/codemirror/addon/scroll/scrollpastend.min.js
index d2062a5d4fff1..09c4380f422b8 100644
--- a/media/editors/codemirror/addon/scroll/scrollpastend.min.js
+++ b/media/editors/codemirror/addon/scroll/scrollpastend.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";function b(b,d){a.changeEnd(d).line==b.lastLine()&&c(b)}function c(a){var b="";if(a.lineCount()>1){var d=a.display.scroller.clientHeight-30,e=a.getLineHandle(a.lastLine()).height;b=d-e+"px"}a.state.scrollPastEndPadding!=b&&(a.state.scrollPastEndPadding=b,a.display.lineSpace.parentNode.style.paddingBottom=b,a.off("refresh",c),a.setSize(),a.on("refresh",c))}a.defineOption("scrollPastEnd",!1,function(d,e,f){f&&f!=a.Init&&(d.off("change",b),d.off("refresh",c),d.display.lineSpace.parentNode.style.paddingBottom="",d.state.scrollPastEndPadding=null),e&&(d.on("change",b),d.on("refresh",c),c(d))})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,d){a.changeEnd(d).line==b.lastLine()&&c(b)}function c(a){var b="";if(a.lineCount()>1){var d=a.display.scroller.clientHeight-30,e=a.getLineHandle(a.lastLine()).height;b=d-e+"px"}a.state.scrollPastEndPadding!=b&&(a.state.scrollPastEndPadding=b,a.display.lineSpace.parentNode.style.paddingBottom=b,a.off("refresh",c),a.setSize(),a.on("refresh",c))}a.defineOption("scrollPastEnd",!1,(function(d,e,f){f&&f!=a.Init&&(d.off("change",b),d.off("refresh",c),d.display.lineSpace.parentNode.style.paddingBottom="",d.state.scrollPastEndPadding=null),e&&(d.on("change",b),d.on("refresh",c),c(d))}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/scroll/simplescrollbars.min.js b/media/editors/codemirror/addon/scroll/simplescrollbars.min.js
index 7fec5793f779c..08f5955aa4b36 100644
--- a/media/editors/codemirror/addon/scroll/simplescrollbars.min.js
+++ b/media/editors/codemirror/addon/scroll/simplescrollbars.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";function b(b,c,d){function e(b){var c=a.wheelEventPixels(b)["horizontal"==f.orientation?"x":"y"],d=f.pos;f.moveTo(f.pos+c),f.pos!=d&&a.e_preventDefault(b)}this.orientation=c,this.scroll=d,this.screen=this.total=this.size=1,this.pos=0,this.node=document.createElement("div"),this.node.className=b+"-"+c,this.inner=this.node.appendChild(document.createElement("div"));var f=this;a.on(this.inner,"mousedown",function(b){function c(){a.off(document,"mousemove",d),a.off(document,"mouseup",c)}function d(a){return 1!=a.which?c():void f.moveTo(h+(a[e]-g)*(f.total/f.size))}if(1==b.which){a.e_preventDefault(b);var e="horizontal"==f.orientation?"pageX":"pageY",g=b[e],h=f.pos;a.on(document,"mousemove",d),a.on(document,"mouseup",c)}}),a.on(this.node,"click",function(b){a.e_preventDefault(b);var c,d=f.inner.getBoundingClientRect();c="horizontal"==f.orientation?b.clientXd.right?1:0:b.clientYd.bottom?1:0,f.moveTo(f.pos+c*f.screen)}),a.on(this.node,"mousewheel",e),a.on(this.node,"DOMMouseScroll",e)}function c(a,c,d){this.addClass=a,this.horiz=new b(a,"horizontal",d),c(this.horiz.node),this.vert=new b(a,"vertical",d),c(this.vert.node),this.width=null}b.prototype.setPos=function(a,b){return 0>a&&(a=0),a>this.total-this.screen&&(a=this.total-this.screen),b||a!=this.pos?(this.pos=a,this.inner.style["horizontal"==this.orientation?"left":"top"]=a*(this.size/this.total)+"px",!0):!1},b.prototype.moveTo=function(a){this.setPos(a)&&this.scroll(a,this.orientation)};var d=10;b.prototype.update=function(a,b,c){var e=this.screen!=b||this.total!=a||this.size!=c;e&&(this.screen=b,this.total=a,this.size=c);var f=this.screen*(this.size/this.total);d>f&&(this.size-=d-f,f=d),this.inner.style["horizontal"==this.orientation?"width":"height"]=f+"px",this.setPos(this.pos,e)},c.prototype.update=function(a){if(null==this.width){var b=window.getComputedStyle?window.getComputedStyle(this.horiz.node):this.horiz.node.currentStyle;b&&(this.width=parseInt(b.height))}var c=this.width||0,d=a.scrollWidth>a.clientWidth+1,e=a.scrollHeight>a.clientHeight+1;return this.vert.node.style.display=e?"block":"none",this.horiz.node.style.display=d?"block":"none",e&&(this.vert.update(a.scrollHeight,a.clientHeight,a.viewHeight-(d?c:0)),this.vert.node.style.bottom=d?c+"px":"0"),d&&(this.horiz.update(a.scrollWidth,a.clientWidth,a.viewWidth-(e?c:0)-a.barLeft),this.horiz.node.style.right=e?c+"px":"0",this.horiz.node.style.left=a.barLeft+"px"),{right:e?c:0,bottom:d?c:0}},c.prototype.setScrollTop=function(a){this.vert.setPos(a)},c.prototype.setScrollLeft=function(a){this.horiz.setPos(a)},c.prototype.clear=function(){var a=this.horiz.node.parentNode;a.removeChild(this.horiz.node),a.removeChild(this.vert.node)},a.scrollbarModel.simple=function(a,b){return new c("CodeMirror-simplescroll",a,b)},a.scrollbarModel.overlay=function(a,b){return new c("CodeMirror-overlayscroll",a,b)}});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c,d){function e(b){var c=a.wheelEventPixels(b)["horizontal"==f.orientation?"x":"y"],d=f.pos;f.moveTo(f.pos+c),f.pos!=d&&a.e_preventDefault(b)}this.orientation=c,this.scroll=d,this.screen=this.total=this.size=1,this.pos=0,this.node=document.createElement("div"),this.node.className=b+"-"+c,this.inner=this.node.appendChild(document.createElement("div"));var f=this;a.on(this.inner,"mousedown",(function(b){function c(){a.off(document,"mousemove",d),a.off(document,"mouseup",c)}function d(a){return 1!=a.which?c():void f.moveTo(h+(a[e]-g)*(f.total/f.size))}if(1==b.which){a.e_preventDefault(b);var e="horizontal"==f.orientation?"pageX":"pageY",g=b[e],h=f.pos;a.on(document,"mousemove",d),a.on(document,"mouseup",c)}})),a.on(this.node,"click",(function(b){a.e_preventDefault(b);var c,d=f.inner.getBoundingClientRect();c="horizontal"==f.orientation?b.clientXd.right?1:0:b.clientYd.bottom?1:0,f.moveTo(f.pos+c*f.screen)})),a.on(this.node,"mousewheel",e),a.on(this.node,"DOMMouseScroll",e)}function c(a,c,d){this.addClass=a,this.horiz=new b(a,"horizontal",d),c(this.horiz.node),this.vert=new b(a,"vertical",d),c(this.vert.node),this.width=null}b.prototype.setPos=function(a,b){return a<0&&(a=0),a>this.total-this.screen&&(a=this.total-this.screen),!(!b&&a==this.pos)&&(this.pos=a,this.inner.style["horizontal"==this.orientation?"left":"top"]=a*(this.size/this.total)+"px",!0)},b.prototype.moveTo=function(a){this.setPos(a)&&this.scroll(a,this.orientation)};var d=10;b.prototype.update=function(a,b,c){var e=this.screen!=b||this.total!=a||this.size!=c;e&&(this.screen=b,this.total=a,this.size=c);var f=this.screen*(this.size/this.total);fa.clientWidth+1,e=a.scrollHeight>a.clientHeight+1;return this.vert.node.style.display=e?"block":"none",this.horiz.node.style.display=d?"block":"none",e&&(this.vert.update(a.scrollHeight,a.clientHeight,a.viewHeight-(d?c:0)),this.vert.node.style.bottom=d?c+"px":"0"),d&&(this.horiz.update(a.scrollWidth,a.clientWidth,a.viewWidth-(e?c:0)-a.barLeft),this.horiz.node.style.right=e?c+"px":"0",this.horiz.node.style.left=a.barLeft+"px"),{right:e?c:0,bottom:d?c:0}},c.prototype.setScrollTop=function(a){this.vert.setPos(a)},c.prototype.setScrollLeft=function(a){this.horiz.setPos(a)},c.prototype.clear=function(){var a=this.horiz.node.parentNode;a.removeChild(this.horiz.node),a.removeChild(this.vert.node)},a.scrollbarModel.simple=function(a,b){return new c("CodeMirror-simplescroll",a,b)},a.scrollbarModel.overlay=function(a,b){return new c("CodeMirror-overlayscroll",a,b)}}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/search/jump-to-line.min.js b/media/editors/codemirror/addon/search/jump-to-line.min.js
index 486c21713fb68..985b4b4e5df3f 100644
--- a/media/editors/codemirror/addon/search/jump-to-line.min.js
+++ b/media/editors/codemirror/addon/search/jump-to-line.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../dialog/dialog")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../dialog/dialog"],a):a(CodeMirror)}(function(a){"use strict";function b(a,b,c,d,e){a.openDialog?a.openDialog(b,e,{value:d,selectValueOnOpen:!0}):e(prompt(c,d))}function c(a,b){var c=Number(b);return/^[-+]/.test(b)?a.getCursor().line+c:c-1}var d='Jump to line: (Use line:column or scroll% syntax)';a.commands.jumpToLine=function(a){var e=a.getCursor();b(a,d,"Jump to line:",e.line+1+":"+e.ch,function(b){if(b){var d;if(d=/^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(b))a.setCursor(c(a,d[1]),Number(d[2]));else if(d=/^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(b)){var f=Math.round(a.lineCount()*Number(d[1])/100);/^[-+]/.test(d[1])&&(f=e.line+f+1),a.setCursor(f-1,e.ch)}else(d=/^\s*\:?\s*([\+\-]?\d+)\s*/.exec(b))&&a.setCursor(c(a,d[1]),e.ch)}})},a.keyMap["default"]["Alt-G"]="jumpToLine"});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../dialog/dialog")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../dialog/dialog"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c,d,e){a.openDialog?a.openDialog(b,e,{value:d,selectValueOnOpen:!0}):e(prompt(c,d))}function c(a,b){var c=Number(b);return/^[-+]/.test(b)?a.getCursor().line+c:c-1}var d='Jump to line: (Use line:column or scroll% syntax)';a.commands.jumpToLine=function(a){var e=a.getCursor();b(a,d,"Jump to line:",e.line+1+":"+e.ch,(function(b){if(b){var d;if(d=/^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(b))a.setCursor(c(a,d[1]),Number(d[2]));else if(d=/^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(b)){var f=Math.round(a.lineCount()*Number(d[1])/100);/^[-+]/.test(d[1])&&(f=e.line+f+1),a.setCursor(f-1,e.ch)}else(d=/^\s*\:?\s*([\+\-]?\d+)\s*/.exec(b))&&a.setCursor(c(a,d[1]),e.ch)}}))},a.keyMap.default["Alt-G"]="jumpToLine"}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/search/match-highlighter.min.js b/media/editors/codemirror/addon/search/match-highlighter.min.js
index 2af9bd3b26715..9f8df563fc5c2 100644
--- a/media/editors/codemirror/addon/search/match-highlighter.min.js
+++ b/media/editors/codemirror/addon/search/match-highlighter.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./matchesonscrollbar")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./matchesonscrollbar"],a):a(CodeMirror)}(function(a){"use strict";function b(a){this.options={};for(var b in l)this.options[b]=(a&&a.hasOwnProperty(b)?a:l)[b];this.overlay=this.timeout=null,this.matchesonscroll=null,this.active=!1}function c(a){var b=a.state.matchHighlighter;(b.active||a.hasFocus())&&e(a,b)}function d(a){var b=a.state.matchHighlighter;b.active||(b.active=!0,e(a,b))}function e(a,b){clearTimeout(b.timeout),b.timeout=setTimeout(function(){h(a)},b.options.delay)}function f(a,b,c,d){var e=a.state.matchHighlighter;if(a.addOverlay(e.overlay=k(b,c,d)),e.options.annotateScrollbar&&a.showMatchesOnScrollbar){var f=c?new RegExp("\\b"+b+"\\b"):b;e.matchesonscroll=a.showMatchesOnScrollbar(f,!1,{className:"CodeMirror-selection-highlight-scrollbar"})}}function g(a){var b=a.state.matchHighlighter;b.overlay&&(a.removeOverlay(b.overlay),b.overlay=null,b.matchesonscroll&&(b.matchesonscroll.clear(),b.matchesonscroll=null))}function h(a){a.operation(function(){var b=a.state.matchHighlighter;if(g(a),!a.somethingSelected()&&b.options.showToken){for(var c=b.options.showToken===!0?/[\w$]/:b.options.showToken,d=a.getCursor(),e=a.getLine(d.line),h=d.ch,j=h;h&&c.test(e.charAt(h-1));)--h;for(;jh&&f(a,e.slice(h,j),c,b.options.style))}var k=a.getCursor("from"),l=a.getCursor("to");if(k.line==l.line&&(!b.options.wordsOnly||i(a,k,l))){var m=a.getRange(k,l);b.options.trim&&(m=m.replace(/^\s+|\s+$/g,"")),m.length>=b.options.minChars&&f(a,m,!1,b.options.style)}})}function i(a,b,c){var d=a.getRange(b,c);if(null!==d.match(/^\w+$/)){if(b.ch>0){var e={line:b.line,ch:b.ch-1},f=a.getRange(e,b);if(null===f.match(/\W/))return!1}if(c.ch=b.options.minChars&&f(a,m,!1,b.options.style)}}))}function i(a,b,c){var d=a.getRange(b,c);if(null!==d.match(/^\w+$/)){if(b.ch>0){var e={line:b.line,ch:b.ch-1},f=a.getRange(e,b);if(null===f.match(/\W/))return!1}if(c.ch=a?a:Math.max(b,a+c)}a.defineExtension("showMatchesOnScrollbar",function(a,c,d){return"string"==typeof d&&(d={className:d}),d||(d={}),new b(this,a,c,d)});var d=1e3;b.prototype.findMatches=function(){if(this.gap){for(var b=0;b=this.gap.to)break;c.to.line>=this.gap.from&&this.matches.splice(b--,1)}for(var e=this.cm.getSearchCursor(this.query,a.Pos(this.gap.from,0),this.caseFold),f=this.options&&this.options.maxMatches||d;e.findNext();){var c={from:e.from(),to:e.to()};if(c.from.line>=this.gap.to)break;if(this.matches.splice(b++,0,c),this.matches.length>f)break}this.gap=null}},b.prototype.onChange=function(b){var d=b.from.line,e=a.changeEnd(b).line,f=e-b.to.line;if(this.gap?(this.gap.from=Math.min(c(this.gap.from,d,f),b.from.line),this.gap.to=Math.max(c(this.gap.to,d,f),b.from.line)):this.gap={from:b.from.line,to:e+1},f)for(var g=0;g=this.gap.to)break;c.to.line>=this.gap.from&&this.matches.splice(b--,1)}for(var e=this.cm.getSearchCursor(this.query,a.Pos(this.gap.from,0),this.caseFold),f=this.options&&this.options.maxMatches||d;e.findNext();){var c={from:e.from(),to:e.to()};if(c.from.line>=this.gap.to)break;if(this.matches.splice(b++,0,c),this.matches.length>f)break}this.gap=null}},b.prototype.onChange=function(b){var d=b.from.line,e=a.changeEnd(b).line,f=e-b.to.line;if(this.gap?(this.gap.from=Math.min(c(this.gap.from,d,f),b.from.line),this.gap.to=Math.max(c(this.gap.to,d,f),b.from.line)):this.gap={from:b.from.line,to:e+1},f)for(var g=0;gb.cursorCoords(c,"window").top&&((k=d).style.opacity=.4)}))};g(b,r,j,m,function(c,e){var f=a.keyName(c),g=a.keyMap[b.getOption("keyMap")][f];g||(g=b.getOption("extraKeys")[f]),"findNext"==g||"findPrev"==g||"findPersistentNext"==g||"findPersistentPrev"==g?(a.e_stop(c),l(b,d(b),e),b.execCommand(g)):("find"==g||"findPersistent"==g)&&(a.e_stop(c),m(e,c))}),f&&j&&(l(b,i,j),n(b,c))}else h(b,r,"Search for:",j,function(a){a&&!i.query&&b.operation(function(){l(b,i,a),i.posFrom=i.posTo=b.getCursor(),n(b,c)})})}function n(b,c,e){b.operation(function(){var g=d(b),h=f(b,g.query,c?g.posFrom:g.posTo);(h.find(c)||(h=f(b,g.query,c?a.Pos(b.lastLine()):a.Pos(b.firstLine(),0)),h.find(c)))&&(b.setSelection(h.from(),h.to()),b.scrollIntoView({from:h.from(),to:h.to()},20),g.posFrom=h.from(),g.posTo=h.to(),e&&e(h.from(),h.to()))})}function o(a){a.operation(function(){var b=d(a);b.lastQuery=b.query,b.query&&(b.query=b.queryText=null,a.removeOverlay(b.overlay),b.annotate&&(b.annotate.clear(),b.annotate=null))})}function p(a,b,c){a.operation(function(){for(var d=f(a,b);d.findNext();)if("string"!=typeof b){var e=a.getRange(d.from(),d.to()).match(b);d.replace(c.replace(/\$(\d)/g,function(a,b){return e[b]}))}else d.replace(c)})}function q(a,b){if(!a.getOption("readOnly")){var c=a.getSelection()||d(a).lastQuery,e=b?"Replace all:":"Replace:";h(a,e+s,e,c,function(c){c&&(c=k(c),h(a,t,"Replace with:","",function(d){if(d=j(d),b)p(a,c,d);else{o(a);var e=f(a,c,a.getCursor("from")),g=function(){var b,j=e.from();!(b=e.findNext())&&(e=f(a,c),!(b=e.findNext())||j&&e.from().line==j.line&&e.from().ch==j.ch)||(a.setSelection(e.from(),e.to()),a.scrollIntoView({from:e.from(),to:e.to()}),i(a,u,"Replace?",[function(){h(b)},g,function(){p(a,c,d)}]))},h=function(a){e.replace("string"==typeof c?d:d.replace(/\$(\d)/g,function(b,c){return a[c]})),g()};g()}}))})}}var r='Search: (Use /re/ syntax for regexp search)',s=' (Use /re/ syntax for regexp search)',t='With: ',u="Replace? ";a.commands.find=function(a){o(a),m(a)},a.commands.findPersistent=function(a){o(a),m(a,!1,!0)},a.commands.findPersistentNext=function(a){m(a,!1,!0,!0)},a.commands.findPersistentPrev=function(a){m(a,!0,!0,!0)},a.commands.findNext=m,a.commands.findPrev=function(a){m(a,!0)},a.commands.clearSearch=o,a.commands.replace=q,a.commands.replaceAll=function(a){q(a,!0)}});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./searchcursor"),require("../dialog/dialog")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./searchcursor","../dialog/dialog"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return"string"==typeof a?a=new RegExp(a.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),b?"gi":"g"):a.global||(a=new RegExp(a.source,a.ignoreCase?"gi":"g")),{token:function(b){a.lastIndex=b.pos;var c=a.exec(b.string);return c&&c.index==b.pos?(b.pos+=c[0].length||1,"searching"):void(c?b.pos=c.index:b.skipToEnd())}}}function c(){this.posFrom=this.posTo=this.lastQuery=this.query=null,this.overlay=null}function d(a){return a.state.search||(a.state.search=new c)}function e(a){return"string"==typeof a&&a==a.toLowerCase()}function f(a,b,c){return a.getSearchCursor(b,c,e(b))}function g(a,b,c,d,e){a.openDialog(b,d,{value:c,selectValueOnOpen:!0,closeOnEnter:!1,onClose:function(){o(a)},onKeyDown:e})}function h(a,b,c,d,e){a.openDialog?a.openDialog(b,e,{value:d,selectValueOnOpen:!0}):e(prompt(c,d))}function i(a,b,c,d){a.openConfirm?a.openConfirm(b,d):confirm(c)&&d[0]()}function j(a){return a.replace(/\\(.)/g,(function(a,b){return"n"==b?"\n":"r"==b?"\r":b}))}function k(a){var b=a.match(/^\/(.*)\/([a-z]*)$/);if(b)try{a=new RegExp(b[1],b[2].indexOf("i")==-1?"":"i")}catch(a){}else a=j(a);return("string"==typeof a?""==a:a.test(""))&&(a=/x^/),a}function l(a,c,d){c.queryText=d,c.query=k(d),a.removeOverlay(c.overlay,e(c.query)),c.overlay=b(c.query,e(c.query)),a.addOverlay(c.overlay),a.showMatchesOnScrollbar&&(c.annotate&&(c.annotate.clear(),c.annotate=null),c.annotate=a.showMatchesOnScrollbar(c.query,e(c.query)))}function m(b,c,e,f){var i=d(b);if(i.query)return n(b,c);var j=b.getSelection()||i.lastQuery;if(e&&b.openDialog){var k=null,m=function(c,d){a.e_stop(d),c&&(c!=i.queryText&&(l(b,i,c),i.posFrom=i.posTo=b.getCursor()),k&&(k.style.opacity=1),n(b,d.shiftKey,(function(a,c){var d;c.line<3&&document.querySelector&&(d=b.display.wrapper.querySelector(".CodeMirror-dialog"))&&d.getBoundingClientRect().bottom-4>b.cursorCoords(c,"window").top&&((k=d).style.opacity=.4)})))};g(b,r,j,m,(function(c,e){var f=a.keyName(c),g=a.keyMap[b.getOption("keyMap")][f];g||(g=b.getOption("extraKeys")[f]),"findNext"==g||"findPrev"==g||"findPersistentNext"==g||"findPersistentPrev"==g?(a.e_stop(c),l(b,d(b),e),b.execCommand(g)):"find"!=g&&"findPersistent"!=g||(a.e_stop(c),m(e,c))})),f&&j&&(l(b,i,j),n(b,c))}else h(b,r,"Search for:",j,(function(a){a&&!i.query&&b.operation((function(){l(b,i,a),i.posFrom=i.posTo=b.getCursor(),n(b,c)}))}))}function n(b,c,e){b.operation((function(){var g=d(b),h=f(b,g.query,c?g.posFrom:g.posTo);(h.find(c)||(h=f(b,g.query,c?a.Pos(b.lastLine()):a.Pos(b.firstLine(),0)),h.find(c)))&&(b.setSelection(h.from(),h.to()),b.scrollIntoView({from:h.from(),to:h.to()},20),g.posFrom=h.from(),g.posTo=h.to(),e&&e(h.from(),h.to()))}))}function o(a){a.operation((function(){var b=d(a);b.lastQuery=b.query,b.query&&(b.query=b.queryText=null,a.removeOverlay(b.overlay),b.annotate&&(b.annotate.clear(),b.annotate=null))}))}function p(a,b,c){a.operation((function(){for(var d=f(a,b);d.findNext();)if("string"!=typeof b){var e=a.getRange(d.from(),d.to()).match(b);d.replace(c.replace(/\$(\d)/g,(function(a,b){return e[b]})))}else d.replace(c)}))}function q(a,b){if(!a.getOption("readOnly")){var c=a.getSelection()||d(a).lastQuery,e=b?"Replace all:":"Replace:";h(a,e+s,e,c,(function(c){c&&(c=k(c),h(a,t,"Replace with:","",(function(d){if(d=j(d),b)p(a,c,d);else{o(a);var e=f(a,c,a.getCursor("from")),g=function(){var b,j=e.from();!(b=e.findNext())&&(e=f(a,c),!(b=e.findNext())||j&&e.from().line==j.line&&e.from().ch==j.ch)||(a.setSelection(e.from(),e.to()),a.scrollIntoView({from:e.from(),to:e.to()}),i(a,u,"Replace?",[function(){h(b)},g,function(){p(a,c,d)}]))},h=function(a){e.replace("string"==typeof c?d:d.replace(/\$(\d)/g,(function(b,c){return a[c]}))),g()};g()}})))}))}}var r='Search: (Use /re/ syntax for regexp search)',s=' (Use /re/ syntax for regexp search)',t='With: ',u="Replace? ";a.commands.find=function(a){o(a),m(a)},a.commands.findPersistent=function(a){o(a),m(a,!1,!0)},a.commands.findPersistentNext=function(a){m(a,!1,!0,!0)},a.commands.findPersistentPrev=function(a){m(a,!0,!0,!0)},a.commands.findNext=m,a.commands.findPrev=function(a){m(a,!0)},a.commands.clearSearch=o,a.commands.replace=q,a.commands.replaceAll=function(a){q(a,!0)}}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/search/searchcursor.min.js b/media/editors/codemirror/addon/search/searchcursor.min.js
index ce7c259960056..9413508851167 100644
--- a/media/editors/codemirror/addon/search/searchcursor.min.js
+++ b/media/editors/codemirror/addon/search/searchcursor.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";function b(a,b,e,f){if(this.atOccurrence=!1,this.doc=a,null==f&&"string"==typeof b&&(f=!1),e=e?a.clipPos(e):d(0,0),this.pos={from:e,to:e},"string"!=typeof b)b.global||(b=new RegExp(b.source,b.ignoreCase?"ig":"g")),this.matches=function(c,e){if(c){b.lastIndex=0;for(var f,g,h=a.getLine(e.line).slice(0,e.ch),i=0;;){b.lastIndex=i;var j=b.exec(h);if(!j)break;if(f=j,g=f.index,i=f.index+(f[0].length||1),i==h.length)break}var k=f&&f[0].length||0;k||(0==g&&0==h.length?f=void 0:g!=a.getLine(e.line).length&&k++)}else{b.lastIndex=e.ch;var h=a.getLine(e.line),f=b.exec(h),k=f&&f[0].length||0,g=f&&f.index;g+k==h.length||k||(k=1)}return f&&k?{from:d(e.line,g),to:d(e.line,g+k),match:f}:void 0};else{var g=b;f&&(b=b.toLowerCase());var h=f?function(a){return a.toLowerCase()}:function(a){return a},i=b.split("\n");if(1==i.length)b.length?this.matches=function(e,f){if(e){var i=a.getLine(f.line).slice(0,f.ch),j=h(i),k=j.lastIndexOf(b);if(k>-1)return k=c(i,j,k),{from:d(f.line,k),to:d(f.line,k+g.length)}}else{var i=a.getLine(f.line).slice(f.ch),j=h(i),k=j.indexOf(b);if(k>-1)return k=c(i,j,k)+f.ch,{from:d(f.line,k),to:d(f.line,k+g.length)}}}:this.matches=function(){};else{var j=g.split("\n");this.matches=function(b,c){var e=i.length-1;if(b){if(c.line-(i.length-1)=1;--k,--g)if(i[k]!=h(a.getLine(g)))return;var l=a.getLine(g),m=l.length-j[0].length;if(h(l.slice(m))!=i[0])return;return{from:d(g,m),to:f}}if(!(c.line+(i.length-1)>a.lastLine())){var l=a.getLine(c.line),m=l.length-j[0].length;if(h(l.slice(m))==i[0]){for(var n=d(c.line,m),g=c.line+1,k=1;e>k;++k,++g)if(i[k]!=h(a.getLine(g)))return;if(h(a.getLine(g).slice(0,j[e].length))==i[e])return{from:n,to:d(g,j[e].length)}}}}}}}function c(a,b,c){if(a.length==b.length)return c;for(var d=Math.min(c,a.length);;){var e=a.slice(0,d).toLowerCase().length;if(c>e)++d;else{if(!(e>c))return d;--d}}}var d=a.Pos;b.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(a){function b(a){var b=d(a,0);return c.pos={from:b,to:b},c.atOccurrence=!1,!1}for(var c=this,e=this.doc.clipPos(a?this.pos.from:this.pos.to);;){if(this.pos=this.matches(a,e))return this.atOccurrence=!0,this.pos.match||!0;if(a){if(!e.line)return b(0);e=d(e.line-1,this.doc.getLine(e.line-1).length)}else{var f=this.doc.lineCount();if(e.line==f-1)return b(f);e=d(e.line+1,0)}}},from:function(){return this.atOccurrence?this.pos.from:void 0},to:function(){return this.atOccurrence?this.pos.to:void 0},replace:function(b,c){if(this.atOccurrence){var e=a.splitLines(b);this.doc.replaceRange(e,this.pos.from,this.pos.to,c),this.pos.to=d(this.pos.from.line+e.length-1,e[e.length-1].length+(1==e.length?this.pos.from.ch:0))}}},a.defineExtension("getSearchCursor",function(a,c,d){return new b(this.doc,a,c,d)}),a.defineDocExtension("getSearchCursor",function(a,c,d){return new b(this,a,c,d)}),a.defineExtension("selectMatches",function(b,c){for(var d=[],e=this.getSearchCursor(b,this.getCursor("from"),c);e.findNext()&&!(a.cmpPos(e.to(),this.getCursor("to"))>0);)d.push({anchor:e.from(),head:e.to()});d.length&&this.setSelections(d,0)})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,e,f){if(this.atOccurrence=!1,this.doc=a,null==f&&"string"==typeof b&&(f=!1),e=e?a.clipPos(e):d(0,0),this.pos={from:e,to:e},"string"!=typeof b)b.global||(b=new RegExp(b.source,b.ignoreCase?"ig":"g")),this.matches=function(c,e){if(c){b.lastIndex=0;for(var f,g,h=a.getLine(e.line).slice(0,e.ch),i=0;;){b.lastIndex=i;var j=b.exec(h);if(!j)break;if(f=j,g=f.index,i=f.index+(f[0].length||1),i==h.length)break}var k=f&&f[0].length||0;k||(0==g&&0==h.length?f=void 0:g!=a.getLine(e.line).length&&k++)}else{b.lastIndex=e.ch;var h=a.getLine(e.line),f=b.exec(h),k=f&&f[0].length||0,g=f&&f.index;g+k==h.length||k||(k=1)}if(f&&k)return{from:d(e.line,g),to:d(e.line,g+k),match:f}};else{var g=b;f&&(b=b.toLowerCase());var h=f?function(a){return a.toLowerCase()}:function(a){return a},i=b.split("\n");if(1==i.length)b.length?this.matches=function(e,f){if(e){var i=a.getLine(f.line).slice(0,f.ch),j=h(i),k=j.lastIndexOf(b);if(k>-1)return k=c(i,j,k),{from:d(f.line,k),to:d(f.line,k+g.length)}}else{var i=a.getLine(f.line).slice(f.ch),j=h(i),k=j.indexOf(b);if(k>-1)return k=c(i,j,k)+f.ch,{from:d(f.line,k),to:d(f.line,k+g.length)}}}:this.matches=function(){};else{var j=g.split("\n");this.matches=function(b,c){var e=i.length-1;if(b){if(c.line-(i.length-1)=1;--k,--g)if(i[k]!=h(a.getLine(g)))return;var l=a.getLine(g),m=l.length-j[0].length;if(h(l.slice(m))!=i[0])return;return{from:d(g,m),to:f}}if(!(c.line+(i.length-1)>a.lastLine())){var l=a.getLine(c.line),m=l.length-j[0].length;if(h(l.slice(m))==i[0]){for(var n=d(c.line,m),g=c.line+1,k=1;kc))return d;--d}}}var d=a.Pos;b.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(a){function b(a){var b=d(a,0);return c.pos={from:b,to:b},c.atOccurrence=!1,!1}for(var c=this,e=this.doc.clipPos(a?this.pos.from:this.pos.to);;){if(this.pos=this.matches(a,e))return this.atOccurrence=!0,this.pos.match||!0;if(a){if(!e.line)return b(0);e=d(e.line-1,this.doc.getLine(e.line-1).length)}else{var f=this.doc.lineCount();if(e.line==f-1)return b(f);e=d(e.line+1,0)}}},from:function(){if(this.atOccurrence)return this.pos.from},to:function(){if(this.atOccurrence)return this.pos.to},replace:function(b,c){if(this.atOccurrence){var e=a.splitLines(b);this.doc.replaceRange(e,this.pos.from,this.pos.to,c),this.pos.to=d(this.pos.from.line+e.length-1,e[e.length-1].length+(1==e.length?this.pos.from.ch:0))}}},a.defineExtension("getSearchCursor",(function(a,c,d){return new b(this.doc,a,c,d)})),a.defineDocExtension("getSearchCursor",(function(a,c,d){return new b(this,a,c,d)})),a.defineExtension("selectMatches",(function(b,c){for(var d=[],e=this.getSearchCursor(b,this.getCursor("from"),c);e.findNext()&&!(a.cmpPos(e.to(),this.getCursor("to"))>0);)d.push({anchor:e.from(),head:e.to()});d.length&&this.setSelections(d,0)}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/selection/active-line.min.js b/media/editors/codemirror/addon/selection/active-line.min.js
index 253cd69ec82b7..fc8a30279c0ec 100644
--- a/media/editors/codemirror/addon/selection/active-line.min.js
+++ b/media/editors/codemirror/addon/selection/active-line.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";function b(a){for(var b=0;b=c.line,n=m?c:i(l,0),o=a.markText(k,n,{className:f});if(null==d?e.push(o):e.splice(d++,0,o),m)break;g=l}}function e(a){for(var b=a.state.markedSelection,c=0;c1)return f(a);var b=a.getCursor("start"),c=a.getCursor("end"),g=a.state.markedSelection;if(!g.length)return d(a,b,c);var i=g[0].find(),k=g[g.length-1].find();if(!i||!k||c.line-b.line=0||j(c,i.from)<=0)return f(a);for(;j(b,i.from)>0;)g.shift().clear(),i=g[0].find();for(j(b,i.from)<0&&(i.to.line-b.line0&&(c.line-k.from.line=c.line,n=m?c:i(l,0),o=a.markText(k,n,{className:f});if(null==d?e.push(o):e.splice(d++,0,o),m)break;g=l}}function e(a){for(var b=a.state.markedSelection,c=0;c1)return f(a);var b=a.getCursor("start"),c=a.getCursor("end"),g=a.state.markedSelection;if(!g.length)return d(a,b,c);var i=g[0].find(),k=g[g.length-1].find();if(!i||!k||c.line-b.line=0||j(c,i.from)<=0)return f(a);for(;j(b,i.from)>0;)g.shift().clear(),i=g[0].find();for(j(b,i.from)<0&&(i.to.line-b.line0&&(c.line-k.from.line=b.mouseX&&f.top<=b.mouseY&&f.bottom>=b.mouseY&&(d=!0)}var g=d?b.value:"";a.display.lineDiv.style.cursor!=g&&(a.display.lineDiv.style.cursor=g)}}a.defineOption("selectionPointer",!1,function(e,f){var g=e.state.selectionPointer;g&&(a.off(e.getWrapperElement(),"mousemove",g.mousemove),a.off(e.getWrapperElement(),"mouseout",g.mouseout),a.off(window,"scroll",g.windowScroll),e.off("cursorActivity",d),e.off("scroll",d),e.state.selectionPointer=null,e.display.lineDiv.style.cursor=""),f&&(g=e.state.selectionPointer={value:"string"==typeof f?f:"default",mousemove:function(a){b(e,a)},mouseout:function(a){c(e,a)},windowScroll:function(){d(e)},rects:null,mouseX:null,mouseY:null,willUpdate:!1},a.on(e.getWrapperElement(),"mousemove",g.mousemove),a.on(e.getWrapperElement(),"mouseout",g.mouseout),a.on(window,"scroll",g.windowScroll),e.on("cursorActivity",d),e.on("scroll",d))})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){var c=a.state.selectionPointer;(null==b.buttons?b.which:b.buttons)?c.mouseX=c.mouseY=null:(c.mouseX=b.clientX,c.mouseY=b.clientY),e(a)}function c(a,b){if(!a.getWrapperElement().contains(b.relatedTarget)){var c=a.state.selectionPointer;c.mouseX=c.mouseY=null,e(a)}}function d(a){a.state.selectionPointer.rects=null,e(a)}function e(a){a.state.selectionPointer.willUpdate||(a.state.selectionPointer.willUpdate=!0,setTimeout((function(){f(a),a.state.selectionPointer.willUpdate=!1}),50))}function f(a){var b=a.state.selectionPointer;if(b){if(null==b.rects&&null!=b.mouseX&&(b.rects=[],a.somethingSelected()))for(var c=a.display.selectionDiv.firstChild;c;c=c.nextSibling)b.rects.push(c.getBoundingClientRect());var d=!1;if(null!=b.mouseX)for(var e=0;e=b.mouseX&&f.top<=b.mouseY&&f.bottom>=b.mouseY&&(d=!0)}var g=d?b.value:"";a.display.lineDiv.style.cursor!=g&&(a.display.lineDiv.style.cursor=g)}}a.defineOption("selectionPointer",!1,(function(e,f){var g=e.state.selectionPointer;g&&(a.off(e.getWrapperElement(),"mousemove",g.mousemove),a.off(e.getWrapperElement(),"mouseout",g.mouseout),a.off(window,"scroll",g.windowScroll),e.off("cursorActivity",d),e.off("scroll",d),e.state.selectionPointer=null,e.display.lineDiv.style.cursor=""),f&&(g=e.state.selectionPointer={value:"string"==typeof f?f:"default",mousemove:function(a){b(e,a)},mouseout:function(a){c(e,a)},windowScroll:function(){d(e)},rects:null,mouseX:null,mouseY:null,willUpdate:!1},a.on(e.getWrapperElement(),"mousemove",g.mousemove),a.on(e.getWrapperElement(),"mouseout",g.mouseout),a.on(window,"scroll",g.windowScroll),e.on("cursorActivity",d),e.on("scroll",d))}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/tern/tern.min.js b/media/editors/codemirror/addon/tern/tern.min.js
index 6bfe76e3854cd..b22ca2e180a56 100644
--- a/media/editors/codemirror/addon/tern/tern.min.js
+++ b/media/editors/codemirror/addon/tern/tern.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";function b(a,b,c){var d=a.docs[b];d?c(E(a,d)):a.options.getFile?a.options.getFile(b,c):c(null)}function c(a,b,c){for(var d in a.docs){var e=a.docs[d];if(e.doc==b)return e}if(!c)for(var f=0;;++f)if(d="[doc"+(f||"")+"]",!a.docs[d]){c=d;break}return a.addDoc(c,b)}function d(b,d){return"string"==typeof d?b.docs[d]:(d instanceof a&&(d=d.getDoc()),d instanceof a.Doc?c(b,d):void 0)}function e(a,b,d){var e=c(a,b),g=a.cachedArgHints;g&&g.doc==b&&K(g.start,d.to)>=0&&(a.cachedArgHints=null);var h=e.changed;null==h&&(e.changed=h={from:d.from.line,to:d.from.line});var i=d.from.line+(d.text.length-1);d.from.line=h.to&&(h.to=i+1),h.from>d.from.line&&(h.from=d.from.line),b.lineCount()>I&&d.to-h.from>100&&setTimeout(function(){e.changed&&e.changed.to-e.changed.from>100&&f(a,e)},200)}function f(a,b){a.server.request({files:[{type:"full",name:b.name,text:E(a,b)}]},function(a){a?window.console.error(a):b.changed=null})}function g(b,c,d){b.request(c,{type:"completions",types:!0,docs:!0,urls:!0},function(e,f){if(e)return C(b,c,e);var g=[],i="",j=f.start,k=f.end;'["'==c.getRange(G(j.line,j.ch-2),j)&&'"]'!=c.getRange(k,G(k.line,k.ch+2))&&(i='"]');for(var l=0;l=m;--j){for(var o=c.getLine(j),p=0,q=0;;){var r=o.indexOf(" ",q);if(-1==r)break;p+=i-(r+p)%i-1,q=r+1}if(g=f.column-p,"("==o.charAt(g)){n=!0;break}}if(n){var s=G(j,g),t=b.cachedArgHints;return t&&t.doc==c.getDoc()&&0==K(s,t.start)?k(b,c,h):void b.request(c,{type:"type",preferFunction:!0,end:s},function(a,d){!a&&d.type&&/^fn\(/.test(d.type)&&(b.cachedArgHints={start:s,type:l(d.type),name:d.exprName||d.name||"fn",guess:d.guess,doc:c.getDoc()},k(b,c,h))})}}}}}function k(a,b,c){D(a);for(var d=a.cachedArgHints,e=d.type,f=w("span",d.guess?H+"fhint-guess":null,w("span",H+"fname",d.name),"("),g=0;g ":")")),e.rettype&&f.appendChild(w("span",H+"type",e.rettype));var i=b.cursorCoords(null,"page");a.activeArgHints=z(i.right+1,i.bottom,f)}function l(a){function b(b){for(var c=0,e=d;;){var f=a.charAt(d);if(b.test(f)&&!c)return a.slice(e,d);/[{\[\(]/.test(f)?++c:/[}\]\)]/.test(f)&&--c,++d}}var c=[],d=3;if(")"!=a.charAt(d))for(;;){var e=a.slice(d).match(/^([^, \(\[\{]+): /);if(e&&(d+=e[0].length,e=e[1]),c.push({name:e,type:b(/[\),]/)}),")"==a.charAt(d))break;d+=2}var f=a.slice(d).match(/^\) -> (.*)$/);return{args:c,rettype:f&&f[1]}}function m(a,b){function d(d){var e={type:"definition",variable:d||null},f=c(a,b.getDoc());a.server.request(u(a,f,e),function(c,d){if(c)return C(a,b,c);if(!d.file&&d.url)return void window.open(d.url);if(d.file){var e,g=a.docs[d.file];if(g&&(e=p(g.doc,d)))return a.jumpStack.push({file:f.name,start:b.getCursor("from"),end:b.getCursor("to")}),void o(a,f,g,e.start,e.end)}C(a,b,"Could not find a definition.")})}q(b)?d():x(b,"Jump to variable",function(a){a&&d(a)})}function n(a,b){var d=a.jumpStack.pop(),e=d&&a.docs[d.file];e&&o(a,c(a,b.getDoc()),e,d.start,d.end)}function o(a,b,c,d,e){c.doc.setSelection(d,e),b!=c&&a.options.switchToDoc&&(D(a),a.options.switchToDoc(c.name,c.doc))}function p(a,b){for(var c=b.context.slice(0,b.contextOffset).split("\n"),d=b.start.line-(c.length-1),e=G(d,(1==c.length?b.start.ch:a.getLine(d).length)-c[0].length),f=a.getLine(d).slice(e.ch),g=d+1;gl&&(h=k,j=l)}if(!h)return null;if(1==c.length?h.ch+=c[0].length:h=G(h.line+(c.length-1),c[c.length-1].length),b.start.line==b.end.line)var m=G(h.line,h.ch+(b.end.ch-b.start.ch));else var m=G(h.line+(b.end.line-b.start.line),b.end.ch);return{start:h,end:m}}function q(a){var b=a.getCursor("end"),c=a.getTokenAt(b);return c.start=0&&K(h,j.end)<=0&&(g=f.length-1))}b.setSelections(f,g)})}function t(a,b){for(var c=Object.create(null),d=0;dI&&g!==!1&&b.changed.to-b.changed.from<100&&b.changed.from<=h.line&&b.changed.to>c.end.line){e.push(v(b,h,c.end)),c.file="#0";var f=e[0].offsetLines;null!=c.start&&(c.start=G(c.start.line- -f,c.start.ch)),c.end=G(c.end.line-f,c.end.ch)}else e.push({type:"full",name:b.name,text:E(a,b)}),c.file=b.name,b.changed=null;else c.file=b.name;for(var i in a.docs){var j=a.docs[i];j.changed&&j!=b&&(e.push({type:"full",name:j.name,text:E(a,j)}),j.changed=null)}return{query:c,files:e}}function v(b,c,d){for(var e,f=b.doc,g=null,h=null,i=4,j=c.line-1,k=Math.max(0,j-50);j>=k;--j){var l=f.getLine(j),m=l.search(/\bfunction\b/);if(!(0>m)){var n=a.countColumn(l,null,i);null!=g&&n>=g||(g=n,h=j)}}null==h&&(h=k);var o=Math.min(f.lastLine(),d.line+20);if(null==g||g==a.countColumn(f.getLine(c.line),null,i))e=o;else for(e=d.line+1;o>e;++e){var n=a.countColumn(f.getLine(e),null,i);if(g>=n)break}var p=G(h,0);return{type:"part",name:b.name,offsetLines:p.line,text:f.getRange(p,G(e,0))}}function w(a,b){var c=document.createElement(a);b&&(c.className=b);for(var d=2;d",c):c(prompt(b,""))}function y(b,c,d){function e(){j=!0,i||f()}function f(){b.state.ternTooltip=null,h.parentNode&&(b.off("cursorActivity",f),b.off("blur",f),b.off("scroll",f),B(h))}b.state.ternTooltip&&A(b.state.ternTooltip);var g=b.cursorCoords(),h=b.state.ternTooltip=z(g.right+1,g.bottom,c),i=!1,j=!1;a.on(h,"mousemove",function(){i=!0}),a.on(h,"mouseout",function(b){a.contains(h,b.relatedTarget||b.toElement)||(j?f():i=!1)}),setTimeout(e,d.options.hintDelay?d.options.hintDelay:1700),b.on("cursorActivity",f),b.on("blur",f),b.on("scroll",f)}function z(a,b,c){var d=w("div",H+"tooltip",c);return d.style.left=a+"px",d.style.top=b+"px",document.body.appendChild(d),d}function A(a){var b=a&&a.parentNode;b&&b.removeChild(a)}function B(a){a.style.opacity="0",setTimeout(function(){A(a)},1100)}function C(a,b,c){a.options.showError?a.options.showError(b,c):y(b,String(c),a)}function D(a){a.activeArgHints&&(A(a.activeArgHints),a.activeArgHints=null)}function E(a,b){var c=b.doc.getValue();return a.options.fileFilter&&(c=a.options.fileFilter(c,b.name,b.doc)),c}function F(a){function c(a,b){b&&(a.id=++e,f[e]=b),d.postMessage(a)}var d=a.worker=new Worker(a.options.workerScript);d.postMessage({type:"init",defs:a.options.defs,plugins:a.options.plugins,scripts:a.options.workerDeps});var e=0,f={};d.onmessage=function(d){var e=d.data;"getFile"==e.type?b(a,e.name,function(a,b){c({type:"getFile",err:String(a),text:b,id:e.id})}):"debug"==e.type?window.console.log(e.message):e.id&&f[e.id]&&(f[e.id](e.err,e.body),delete f[e.id])},d.onerror=function(a){for(var b in f)f[b](a);f={}},this.addFile=function(a,b){c({type:"add",name:a,text:b})},this.delFile=function(a){c({type:"del",name:a})},this.request=function(a,b){c({type:"req",body:a},b)}}a.TernServer=function(a){var c=this;this.options=a||{};var d=this.options.plugins||(this.options.plugins={});d.doc_comment||(d.doc_comment=!0),this.docs=Object.create(null),this.options.useWorker?this.server=new F(this):this.server=new tern.Server({getFile:function(a,d){return b(c,a,d)},async:!0,defs:this.options.defs||[],plugins:d}),this.trackChange=function(a,b){e(c,a,b)},this.cachedArgHints=null,this.activeArgHints=null,this.jumpStack=[],this.getHint=function(a,b){return g(c,a,b)},this.getHint.async=!0},a.TernServer.prototype={addDoc:function(b,c){var d={doc:c,name:b,changed:null};return this.server.addFile(b,E(this,d)),a.on(c,"change",this.trackChange),this.docs[b]=d},delDoc:function(b){var c=d(this,b);c&&(a.off(c.doc,"change",this.trackChange),delete this.docs[c.name],this.server.delFile(c.name))},hideDoc:function(a){D(this);var b=d(this,a);b&&b.changed&&f(this,b)},complete:function(a){a.showHint({hint:this.getHint})},showType:function(a,b,c){i(this,a,b,"type",c)},showDocs:function(a,b,c){i(this,a,b,"documentation",c)},updateArgHints:function(a){j(this,a)},jumpToDef:function(a){m(this,a)},jumpBack:function(a){n(this,a)},rename:function(a){r(this,a)},selectName:function(a){s(this,a)},request:function(a,b,d,e){var f=this,g=c(this,a.getDoc()),h=u(this,g,b,e),i=h.query&&this.options.queryOptions&&this.options.queryOptions[h.query.type];if(i)for(var j in i)h.query[j]=i[j];this.server.request(h,function(a,c){!a&&f.options.responseFilter&&(c=f.options.responseFilter(g,b,h,a,c)),d(a,c)})},destroy:function(){D(this),this.worker&&(this.worker.terminate(),this.worker=null)}};var G=a.Pos,H="CodeMirror-Tern-",I=250,J=0,K=a.cmpPos});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){var d=a.docs[b];d?c(E(a,d)):a.options.getFile?a.options.getFile(b,c):c(null)}function c(a,b,c){for(var d in a.docs){var e=a.docs[d];if(e.doc==b)return e}if(!c)for(var f=0;;++f)if(d="[doc"+(f||"")+"]",!a.docs[d]){c=d;break}return a.addDoc(c,b)}function d(b,d){return"string"==typeof d?b.docs[d]:(d instanceof a&&(d=d.getDoc()),d instanceof a.Doc?c(b,d):void 0)}function e(a,b,d){var e=c(a,b),g=a.cachedArgHints;g&&g.doc==b&&K(g.start,d.to)>=0&&(a.cachedArgHints=null);var h=e.changed;null==h&&(e.changed=h={from:d.from.line,to:d.from.line});var i=d.from.line+(d.text.length-1);d.from.line=h.to&&(h.to=i+1),h.from>d.from.line&&(h.from=d.from.line),b.lineCount()>I&&d.to-h.from>100&&setTimeout((function(){e.changed&&e.changed.to-e.changed.from>100&&f(a,e)}),200)}function f(a,b){a.server.request({files:[{type:"full",name:b.name,text:E(a,b)}]},(function(a){a?window.console.error(a):b.changed=null}))}function g(b,c,d){b.request(c,{type:"completions",types:!0,docs:!0,urls:!0},(function(e,f){if(e)return C(b,c,e);var g=[],i="",j=f.start,k=f.end;'["'==c.getRange(G(j.line,j.ch-2),j)&&'"]'!=c.getRange(k,G(k.line,k.ch+2))&&(i='"]');for(var l=0;l=m;--j){for(var o=c.getLine(j),p=0,q=0;;){var r=o.indexOf("\t",q);if(r==-1)break;p+=i-(r+p)%i-1,q=r+1}if(g=f.column-p,"("==o.charAt(g)){n=!0;break}}if(n){var s=G(j,g),t=b.cachedArgHints;return t&&t.doc==c.getDoc()&&0==K(s,t.start)?k(b,c,h):void b.request(c,{type:"type",preferFunction:!0,end:s},(function(a,d){!a&&d.type&&/^fn\(/.test(d.type)&&(b.cachedArgHints={start:s,type:l(d.type),name:d.exprName||d.name||"fn",guess:d.guess,doc:c.getDoc()},k(b,c,h))}))}}}}}function k(a,b,c){D(a);for(var d=a.cachedArgHints,e=d.type,f=w("span",d.guess?H+"fhint-guess":null,w("span",H+"fname",d.name),"("),g=0;g ":")")),e.rettype&&f.appendChild(w("span",H+"type",e.rettype));var i=b.cursorCoords(null,"page");a.activeArgHints=z(i.right+1,i.bottom,f)}function l(a){function b(b){for(var c=0,e=d;;){var f=a.charAt(d);if(b.test(f)&&!c)return a.slice(e,d);/[{\[\(]/.test(f)?++c:/[}\]\)]/.test(f)&&--c,++d}}var c=[],d=3;if(")"!=a.charAt(d))for(;;){var e=a.slice(d).match(/^([^, \(\[\{]+): /);if(e&&(d+=e[0].length,e=e[1]),c.push({name:e,type:b(/[\),]/)}),")"==a.charAt(d))break;d+=2}var f=a.slice(d).match(/^\) -> (.*)$/);return{args:c,rettype:f&&f[1]}}function m(a,b){function d(d){var e={type:"definition",variable:d||null},f=c(a,b.getDoc());a.server.request(u(a,f,e),(function(c,d){if(c)return C(a,b,c);if(!d.file&&d.url)return void window.open(d.url);if(d.file){var e,g=a.docs[d.file];if(g&&(e=p(g.doc,d)))return a.jumpStack.push({file:f.name,start:b.getCursor("from"),end:b.getCursor("to")}),void o(a,f,g,e.start,e.end)}C(a,b,"Could not find a definition.")}))}q(b)?d():x(b,"Jump to variable",(function(a){a&&d(a)}))}function n(a,b){var d=a.jumpStack.pop(),e=d&&a.docs[d.file];e&&o(a,c(a,b.getDoc()),e,d.start,d.end)}function o(a,b,c,d,e){c.doc.setSelection(d,e),b!=c&&a.options.switchToDoc&&(D(a),a.options.switchToDoc(c.name,c.doc))}function p(a,b){for(var c=b.context.slice(0,b.contextOffset).split("\n"),d=b.start.line-(c.length-1),e=G(d,(1==c.length?b.start.ch:a.getLine(d).length)-c[0].length),f=a.getLine(d).slice(e.ch),g=d+1;g=0&&K(h,j.end)<=0&&(g=f.length-1))}b.setSelections(f,g)}))}function t(a,b){for(var c=Object.create(null),d=0;dI&&g!==!1&&b.changed.to-b.changed.from<100&&b.changed.from<=h.line&&b.changed.to>c.end.line){e.push(v(b,h,c.end)),c.file="#0";var f=e[0].offsetLines;null!=c.start&&(c.start=G(c.start.line- -f,c.start.ch)),c.end=G(c.end.line-f,c.end.ch)}else e.push({type:"full",name:b.name,text:E(a,b)}),c.file=b.name,b.changed=null;else c.file=b.name;for(var i in a.docs){var j=a.docs[i];j.changed&&j!=b&&(e.push({type:"full",name:j.name,text:E(a,j)}),j.changed=null)}return{query:c,files:e}}function v(b,c,d){for(var e,f=b.doc,g=null,h=null,i=4,j=c.line-1,k=Math.max(0,j-50);j>=k;--j){var l=f.getLine(j),m=l.search(/\bfunction\b/);if(!(m<0)){var n=a.countColumn(l,null,i);null!=g&&g<=n||(g=n,h=j)}}null==h&&(h=k);var o=Math.min(f.lastLine(),d.line+20);if(null==g||g==a.countColumn(f.getLine(c.line),null,i))e=o;else for(e=d.line+1;e",c):c(prompt(b,""))}function y(b,c,d){function e(){j=!0,i||f()}function f(){b.state.ternTooltip=null,h.parentNode&&(b.off("cursorActivity",f),b.off("blur",f),b.off("scroll",f),B(h))}b.state.ternTooltip&&A(b.state.ternTooltip);var g=b.cursorCoords(),h=b.state.ternTooltip=z(g.right+1,g.bottom,c),i=!1,j=!1;a.on(h,"mousemove",(function(){i=!0})),a.on(h,"mouseout",(function(b){a.contains(h,b.relatedTarget||b.toElement)||(j?f():i=!1)})),setTimeout(e,d.options.hintDelay?d.options.hintDelay:1700),b.on("cursorActivity",f),b.on("blur",f),b.on("scroll",f)}function z(a,b,c){var d=w("div",H+"tooltip",c);return d.style.left=a+"px",d.style.top=b+"px",document.body.appendChild(d),d}function A(a){var b=a&&a.parentNode;b&&b.removeChild(a)}function B(a){a.style.opacity="0",setTimeout((function(){A(a)}),1100)}function C(a,b,c){a.options.showError?a.options.showError(b,c):y(b,String(c),a)}function D(a){a.activeArgHints&&(A(a.activeArgHints),a.activeArgHints=null)}function E(a,b){var c=b.doc.getValue();return a.options.fileFilter&&(c=a.options.fileFilter(c,b.name,b.doc)),c}function F(a){function c(a,b){b&&(a.id=++e,f[e]=b),d.postMessage(a)}var d=a.worker=new Worker(a.options.workerScript);d.postMessage({type:"init",defs:a.options.defs,plugins:a.options.plugins,scripts:a.options.workerDeps});var e=0,f={};d.onmessage=function(d){var e=d.data;"getFile"==e.type?b(a,e.name,(function(a,b){c({type:"getFile",err:String(a),text:b,id:e.id})})):"debug"==e.type?window.console.log(e.message):e.id&&f[e.id]&&(f[e.id](e.err,e.body),delete f[e.id])},d.onerror=function(a){for(var b in f)f[b](a);f={}},this.addFile=function(a,b){c({type:"add",name:a,text:b})},this.delFile=function(a){c({type:"del",name:a})},this.request=function(a,b){c({type:"req",body:a},b)}}a.TernServer=function(a){var c=this;this.options=a||{};var d=this.options.plugins||(this.options.plugins={});d.doc_comment||(d.doc_comment=!0),this.docs=Object.create(null),this.options.useWorker?this.server=new F(this):this.server=new tern.Server({getFile:function(a,d){return b(c,a,d)},async:!0,defs:this.options.defs||[],plugins:d}),this.trackChange=function(a,b){e(c,a,b)},this.cachedArgHints=null,this.activeArgHints=null,this.jumpStack=[],this.getHint=function(a,b){return g(c,a,b)},this.getHint.async=!0},a.TernServer.prototype={addDoc:function(b,c){var d={doc:c,name:b,changed:null};return this.server.addFile(b,E(this,d)),a.on(c,"change",this.trackChange),this.docs[b]=d},delDoc:function(b){var c=d(this,b);c&&(a.off(c.doc,"change",this.trackChange),delete this.docs[c.name],this.server.delFile(c.name))},hideDoc:function(a){D(this);var b=d(this,a);b&&b.changed&&f(this,b)},complete:function(a){a.showHint({hint:this.getHint})},showType:function(a,b,c){i(this,a,b,"type",c)},showDocs:function(a,b,c){i(this,a,b,"documentation",c)},updateArgHints:function(a){j(this,a)},jumpToDef:function(a){m(this,a)},jumpBack:function(a){n(this,a)},rename:function(a){r(this,a)},selectName:function(a){s(this,a)},request:function(a,b,d,e){var f=this,g=c(this,a.getDoc()),h=u(this,g,b,e),i=h.query&&this.options.queryOptions&&this.options.queryOptions[h.query.type];if(i)for(var j in i)h.query[j]=i[j];this.server.request(h,(function(a,c){!a&&f.options.responseFilter&&(c=f.options.responseFilter(g,b,h,a,c)),d(a,c)}))},destroy:function(){D(this),this.worker&&(this.worker.terminate(),this.worker=null)}};var G=a.Pos,H="CodeMirror-Tern-",I=250,J=0,K=a.cmpPos}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/tern/worker.min.js b/media/editors/codemirror/addon/tern/worker.min.js
index 12d3c4867433d..245097953d395 100644
--- a/media/editors/codemirror/addon/tern/worker.min.js
+++ b/media/editors/codemirror/addon/tern/worker.min.js
@@ -1 +1 @@
-function getFile(a,b){postMessage({type:"getFile",name:a,id:++nextId}),pending[nextId]=b}function startServer(a,b,c){c&&importScripts.apply(null,c),server=new tern.Server({getFile:getFile,async:!0,defs:a,plugins:b})}var server;this.onmessage=function(a){var b=a.data;switch(b.type){case"init":return startServer(b.defs,b.plugins,b.scripts);case"add":return server.addFile(b.name,b.text);case"del":return server.delFile(b.name);case"req":return server.request(b.body,function(a,c){postMessage({id:b.id,body:c,err:a&&String(a)})});case"getFile":var c=pending[b.id];return delete pending[b.id],c(b.err,b.text);default:throw new Error("Unknown message type: "+b.type)}};var nextId=0,pending={};this.console={log:function(a){postMessage({type:"debug",message:a})}};
\ No newline at end of file
+function getFile(a,b){postMessage({type:"getFile",name:a,id:++nextId}),pending[nextId]=b}function startServer(a,b,c){c&&importScripts.apply(null,c),server=new tern.Server({getFile:getFile,async:!0,defs:a,plugins:b})}var server;this.onmessage=function(a){var b=a.data;switch(b.type){case"init":return startServer(b.defs,b.plugins,b.scripts);case"add":return server.addFile(b.name,b.text);case"del":return server.delFile(b.name);case"req":return server.request(b.body,(function(a,c){postMessage({id:b.id,body:c,err:a&&String(a)})}));case"getFile":var c=pending[b.id];return delete pending[b.id],c(b.err,b.text);default:throw new Error("Unknown message type: "+b.type)}};var nextId=0,pending={};this.console={log:function(a){postMessage({type:"debug",message:a})}};
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/wrap/hardwrap.min.js b/media/editors/codemirror/addon/wrap/hardwrap.min.js
index 405a9d6fbfbab..aeb1100e7e76a 100644
--- a/media/editors/codemirror/addon/wrap/hardwrap.min.js
+++ b/media/editors/codemirror/addon/wrap/hardwrap.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";function b(a,b,c){for(var d=c.paragraphStart||a.getHelper(b,"paragraphStart"),e=b.line,f=a.firstLine();e>f;--e){var g=a.getLine(e);if(d&&d.test(g))break;if(!/\S/.test(g)){++e;break}}for(var h=c.paragraphEnd||a.getHelper(b,"paragraphEnd"),i=b.line+1,j=a.lastLine();j>=i;++i){var g=a.getLine(i);if(h&&h.test(g)){++i;break}if(!/\S/.test(g))break}return{from:e,to:i}}function c(a,b,c,d){for(var e=b;e0&&!c.test(a.slice(e-1,e+1));--e);for(var f=!0;;f=!1){var g=e;if(d)for(;" "==a.charAt(g-1);)--g;if(0!=g||!f)return{from:g,to:e};e=b}}function d(b,d,f,g){d=b.clipPos(d),f=b.clipPos(f);var h=g.column||80,i=g.wrapOn||/\s\S|-[^\.\d]/,j=g.killTrailingSpace!==!1,k=[],l="",m=d.line,n=b.getRange(d,f,!1);if(!n.length)return null;for(var o=n[0].match(/^[ \t]*/)[0],p=0;ph&&o==t&&c(l,h,i,j);u&&u.from==r&&u.to==r+s?(l=o+q,++m):k.push({text:[s?" ":""],from:e(m,r),to:e(m+1,t.length)})}for(;l.length>h;){var v=c(l,h,i,j);k.push({text:["",o],from:e(m,v.from),to:e(m,v.to)}),l=o+l.slice(v.to),++m}}return k.length&&b.operation(function(){for(var c=0;c=0;g--){var h,i=c[g];if(i.empty()){var j=b(a,i.head,{});h={from:e(j.from,0),to:e(j.to-1)}}else h={from:i.from(),to:i.to()};h.to.line>=f||(f=h.from.line,d(a,h.from,h.to,{}))}})},a.defineExtension("wrapRange",function(a,b,c){return d(this,a,b,c||{})}),a.defineExtension("wrapParagraphsInRange",function(a,c,f){f=f||{};for(var g=this,h=[],i=a.line;i<=c.line;){var j=b(g,e(i,0),f);h.push(j),i=j.to}var k=!1;return h.length&&g.operation(function(){for(var a=h.length-1;a>=0;--a)k=k||d(g,e(h[a].from,0),e(h[a].to-1),f)}),k})});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){for(var d=c.paragraphStart||a.getHelper(b,"paragraphStart"),e=b.line,f=a.firstLine();e>f;--e){var g=a.getLine(e);if(d&&d.test(g))break;if(!/\S/.test(g)){++e;break}}for(var h=c.paragraphEnd||a.getHelper(b,"paragraphEnd"),i=b.line+1,j=a.lastLine();i<=j;++i){var g=a.getLine(i);if(h&&h.test(g)){++i;break}if(!/\S/.test(g))break}return{from:e,to:i}}function c(a,b,c,d){for(var e=b;e0&&!c.test(a.slice(e-1,e+1));--e);for(var f=!0;;f=!1){var g=e;if(d)for(;" "==a.charAt(g-1);)--g;if(0!=g||!f)return{from:g,to:e};e=b}}function d(b,d,f,g){d=b.clipPos(d),f=b.clipPos(f);var h=g.column||80,i=g.wrapOn||/\s\S|-[^\.\d]/,j=g.killTrailingSpace!==!1,k=[],l="",m=d.line,n=b.getRange(d,f,!1);if(!n.length)return null;for(var o=n[0].match(/^[ \t]*/)[0],p=0;ph&&o==t&&c(l,h,i,j);u&&u.from==r&&u.to==r+s?(l=o+q,++m):k.push({text:[s?" ":""],from:e(m,r),to:e(m+1,t.length)})}for(;l.length>h;){var v=c(l,h,i,j);k.push({text:["",o],from:e(m,v.from),to:e(m,v.to)}),l=o+l.slice(v.to),++m}}return k.length&&b.operation((function(){for(var c=0;c=0;g--){var h,i=c[g];if(i.empty()){var j=b(a,i.head,{});h={from:e(j.from,0),to:e(j.to-1)}}else h={from:i.from(),to:i.to()};h.to.line>=f||(f=h.from.line,d(a,h.from,h.to,{}))}}))},a.defineExtension("wrapRange",(function(a,b,c){return d(this,a,b,c||{})})),a.defineExtension("wrapParagraphsInRange",(function(a,c,f){f=f||{};for(var g=this,h=[],i=a.line;i<=c.line;){var j=b(g,e(i,0),f);h.push(j),i=j.to}var k=!1;return h.length&&g.operation((function(){for(var a=h.length-1;a>=0;--a)k=k||d(g,e(h[a].from,0),e(h[a].to-1),f)})),k}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/keymap/emacs.min.js b/media/editors/codemirror/keymap/emacs.min.js
index 3082942a36590..681fe512edb95 100644
--- a/media/editors/codemirror/keymap/emacs.min.js
+++ b/media/editors/codemirror/keymap/emacs.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror")):"function"==typeof define&&define.amd?define(["../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";function b(a,b){return a.line==b.line&&a.ch==b.ch}function c(a){I.push(a),I.length>50&&I.shift()}function d(a){return I.length?void(I[I.length-1]+=a):c(a)}function e(a){return I[I.length-(a?Math.min(a,1):1)]||""}function f(){return I.length>1&&I.pop(),e()}function g(a,e,f,g,h){null==h&&(h=a.getRange(e,f)),g&&J&&J.cm==a&&b(e,J.pos)&&a.isClean(J.gen)?d(h):c(h),a.replaceRange("",e,f,"+delete"),J=g?{cm:a,pos:e,gen:a.changeGeneration()}:null}function h(a,b,c){return a.findPosH(b,c,"char",!0)}function i(a,b,c){return a.findPosH(b,c,"word",!0)}function j(a,b,c){return a.findPosV(b,c,"line",a.doc.sel.goalColumn)}function k(a,b,c){return a.findPosV(b,c,"page",a.doc.sel.goalColumn)}function l(a,b,c){for(var d=b.line,e=a.getLine(d),f=/\S/.test(0>c?e.slice(0,b.ch):e.slice(b.ch)),g=a.firstLine(),h=a.lastLine();;){if(d+=c,g>d||d>h)return a.clipPos(H(d-c,0>c?0:null));e=a.getLine(d);var i=/\S/.test(e);if(i)f=!0;else if(f)return H(d,0)}}function m(a,b,c){for(var d=b.line,e=b.ch,f=a.getLine(b.line),g=!1;;){var h=f.charAt(e+(0>c?-1:0));if(h){if(g&&/[!?.]/.test(h))return H(d,e+(c>0?1:0));g||(g=/\w/.test(h)),e+=c}else{if(d==(0>c?a.firstLine():a.lastLine()))return H(d,e);if(f=a.getLine(d+c),!/\S/.test(f))return H(d,e);d+=c,e=0>c?f.length:0}}}function n(a,c,d){var e;if(a.findMatchingBracket&&(e=a.findMatchingBracket(c,!0))&&e.match&&(e.forward?1:-1)==d)return d>0?H(e.to.line,e.to.ch+1):e.to;for(var f=!0;;f=!1){var g=a.getTokenAt(c),h=H(c.line,0>d?g.start:g.end);if(!(f&&d>0&&g.end==c.ch)&&/\w/.test(g.string))return h;var i=a.findPosH(h,d,"char");if(b(h,i))return c;c=i}}function o(a,b){var c=a.state.emacsPrefix;return c?(w(a),"-"==c?-1:Number(c)):b?null:1}function p(a){var b="string"==typeof a?function(b){b.execCommand(a)}:a;return function(a){var c=o(a);b(a);for(var d=1;c>d;++d)b(a)}}function q(a,c,d,e){var f=o(a);0>f&&(e=-e,f=-f);for(var g=0;f>g;++g){var h=d(a,c,e);if(b(h,c))break;c=h}return c}function r(a,b){var c=function(c){c.extendSelection(q(c,c.getCursor(),a,b))};return c.motion=!0,c}function s(a,b,c){for(var d,e=a.listSelections(),f=e.length;f--;)d=e[f].head,g(a,d,q(a,d,b,c),!0)}function t(a){if(a.somethingSelected()){for(var b,c=a.listSelections(),d=c.length;d--;)b=c[d],g(a,b.anchor,b.head);return!0}}function u(a,b){return a.state.emacsPrefix?void("-"!=b&&(a.state.emacsPrefix+=b)):(a.state.emacsPrefix=b,a.on("keyHandled",v),void a.on("inputRead",x))}function v(a,b){a.state.emacsPrefixMap||K.hasOwnProperty(b)||w(a)}function w(a){a.state.emacsPrefix=null,a.off("keyHandled",v),a.off("inputRead",x)}function x(a,b){var c=o(a);if(c>1&&"+input"==b.origin){for(var d=b.text.join("\n"),e="",f=1;c>f;++f)e+=d;a.replaceSelection(e)}}function y(a){a.state.emacsPrefixMap=!0,a.addKeyMap(M),a.on("keyHandled",z),a.on("inputRead",z)}function z(a,b){("string"!=typeof b||!/^\d$/.test(b)&&"Ctrl-U"!=b)&&(a.removeKeyMap(M),a.state.emacsPrefixMap=!1,a.off("keyHandled",z),a.off("inputRead",z))}function A(a){a.setCursor(a.getCursor()),a.setExtending(!a.getExtending()),a.on("change",function(){a.setExtending(!1)})}function B(a){a.setExtending(!1),a.setCursor(a.getCursor())}function C(a,b,c){a.openDialog?a.openDialog(b+': ',c,{bottom:!0}):c(prompt(b,""))}function D(a,b){var c=a.getCursor(),d=a.findPosH(c,1,"word");a.replaceRange(b(a.getRange(c,d)),c,d),a.setCursor(d)}function E(a){for(var b=a.getCursor(),c=b.line,d=b.ch,e=[];c>=a.firstLine();){for(var f=a.getLine(c),g=null==d?f.length:d;g>0;){var d=f.charAt(--g);if(")"==d)e.push("(");else if("]"==d)e.push("[");else if("}"==d)e.push("{");else if(/[\(\{\[]/.test(d)&&(!e.length||e.pop()!=d))return a.extendSelection(H(c,g))}--c,d=null}}function F(a){a.execCommand("clearSearch"),B(a)}function G(a){M[a]=function(b){u(b,a)},L["Ctrl-"+a]=function(b){u(b,a)},K["Ctrl-"+a]=!0}for(var H=a.Pos,I=[],J=null,K={"Alt-G":!0,"Ctrl-X":!0,"Ctrl-Q":!0,"Ctrl-U":!0},L=a.keyMap.emacs=a.normalizeKeyMap({"Ctrl-W":function(a){g(a,a.getCursor("start"),a.getCursor("end"))},"Ctrl-K":p(function(a){var b=a.getCursor(),c=a.clipPos(H(b.line)),d=a.getRange(b,c);/\S/.test(d)||(d+="\n",c=H(b.line+1,0)),g(a,b,c,!0,d)}),"Alt-W":function(a){c(a.getSelection()),B(a)},"Ctrl-Y":function(a){var b=a.getCursor();a.replaceRange(e(o(a)),b,b,"paste"),a.setSelection(b,a.getCursor())},"Alt-Y":function(a){a.replaceSelection(f(),"around","paste")},"Ctrl-Space":A,"Ctrl-Shift-2":A,"Ctrl-F":r(h,1),"Ctrl-B":r(h,-1),Right:r(h,1),Left:r(h,-1),"Ctrl-D":function(a){s(a,h,1)},Delete:function(a){t(a)||s(a,h,1)},"Ctrl-H":function(a){s(a,h,-1)},Backspace:function(a){t(a)||s(a,h,-1)},"Alt-F":r(i,1),"Alt-B":r(i,-1),"Alt-D":function(a){s(a,i,1)},"Alt-Backspace":function(a){s(a,i,-1)},"Ctrl-N":r(j,1),"Ctrl-P":r(j,-1),Down:r(j,1),Up:r(j,-1),"Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd",End:"goLineEnd",Home:"goLineStart","Alt-V":r(k,-1),"Ctrl-V":r(k,1),PageUp:r(k,-1),PageDown:r(k,1),"Ctrl-Up":r(l,-1),"Ctrl-Down":r(l,1),"Alt-A":r(m,-1),"Alt-E":r(m,1),"Alt-K":function(a){s(a,m,1)},"Ctrl-Alt-K":function(a){s(a,n,1)},"Ctrl-Alt-Backspace":function(a){s(a,n,-1)},"Ctrl-Alt-F":r(n,1),"Ctrl-Alt-B":r(n,-1),"Shift-Ctrl-Alt-2":function(a){var b=a.getCursor();a.setSelection(q(a,b,n,1),b)},"Ctrl-Alt-T":function(a){var b=n(a,a.getCursor(),-1),c=n(a,b,1),d=n(a,c,1),e=n(a,d,-1);a.replaceRange(a.getRange(e,d)+a.getRange(c,e)+a.getRange(b,c),b,d)},"Ctrl-Alt-U":p(E),"Alt-Space":function(a){for(var b=a.getCursor(),c=b.ch,d=b.ch,e=a.getLine(b.line);c&&/\s/.test(e.charAt(c-1));)--c;for(;d0?a.setCursor(b-1):void C(a,"Goto line",function(b){var c;b&&!isNaN(c=Number(b))&&c==(0|c)&&c>0&&a.setCursor(c-1)})},"Ctrl-X Tab":function(a){a.indentSelection(o(a,!0)||a.getOption("indentUnit"))},"Ctrl-X Ctrl-X":function(a){a.setSelection(a.getCursor("head"),a.getCursor("anchor"))},"Ctrl-X Ctrl-S":"save","Ctrl-X Ctrl-W":"save","Ctrl-X S":"saveAll","Ctrl-X F":"open","Ctrl-X U":p("undo"),"Ctrl-X K":"close","Ctrl-X Delete":function(a){g(a,a.getCursor(),m(a,a.getCursor(),1),!0)},"Ctrl-X H":"selectAll","Ctrl-Q Tab":p("insertTab"),"Ctrl-U":y}),M={"Ctrl-G":w},N=0;10>N;++N)G(String(N));G("-")});
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror")):"function"==typeof define&&define.amd?define(["../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return a.line==b.line&&a.ch==b.ch}function c(a){I.push(a),I.length>50&&I.shift()}function d(a){return I.length?void(I[I.length-1]+=a):c(a)}function e(a){return I[I.length-(a?Math.min(a,1):1)]||""}function f(){return I.length>1&&I.pop(),e()}function g(a,e,f,g,h){null==h&&(h=a.getRange(e,f)),g&&J&&J.cm==a&&b(e,J.pos)&&a.isClean(J.gen)?d(h):c(h),a.replaceRange("",e,f,"+delete"),J=g?{cm:a,pos:e,gen:a.changeGeneration()}:null}function h(a,b,c){return a.findPosH(b,c,"char",!0)}function i(a,b,c){return a.findPosH(b,c,"word",!0)}function j(a,b,c){return a.findPosV(b,c,"line",a.doc.sel.goalColumn)}function k(a,b,c){return a.findPosV(b,c,"page",a.doc.sel.goalColumn)}function l(a,b,c){for(var d=b.line,e=a.getLine(d),f=/\S/.test(c<0?e.slice(0,b.ch):e.slice(b.ch)),g=a.firstLine(),h=a.lastLine();;){if(d+=c,dh)return a.clipPos(H(d-c,c<0?0:null));e=a.getLine(d);var i=/\S/.test(e);if(i)f=!0;else if(f)return H(d,0)}}function m(a,b,c){for(var d=b.line,e=b.ch,f=a.getLine(b.line),g=!1;;){var h=f.charAt(e+(c<0?-1:0));if(h){if(g&&/[!?.]/.test(h))return H(d,e+(c>0?1:0));g||(g=/\w/.test(h)),e+=c}else{if(d==(c<0?a.firstLine():a.lastLine()))return H(d,e);if(f=a.getLine(d+c),!/\S/.test(f))return H(d,e);d+=c,e=c<0?f.length:0}}}function n(a,c,d){var e;if(a.findMatchingBracket&&(e=a.findMatchingBracket(c,!0))&&e.match&&(e.forward?1:-1)==d)return d>0?H(e.to.line,e.to.ch+1):e.to;for(var f=!0;;f=!1){var g=a.getTokenAt(c),h=H(c.line,d<0?g.start:g.end);if(!(f&&d>0&&g.end==c.ch)&&/\w/.test(g.string))return h;var i=a.findPosH(h,d,"char");if(b(h,i))return c;c=i}}function o(a,b){var c=a.state.emacsPrefix;return c?(w(a),"-"==c?-1:Number(c)):b?null:1}function p(a){var b="string"==typeof a?function(b){b.execCommand(a)}:a;return function(a){var c=o(a);b(a);for(var d=1;d1&&"+input"==b.origin){for(var d=b.text.join("\n"),e="",f=1;f0?a.setCursor(b-1):void C(a,"Goto line",(function(b){var c;b&&!isNaN(c=Number(b))&&c==(0|c)&&c>0&&a.setCursor(c-1)}))},"Ctrl-X Tab":function(a){a.indentSelection(o(a,!0)||a.getOption("indentUnit"))},"Ctrl-X Ctrl-X":function(a){a.setSelection(a.getCursor("head"),a.getCursor("anchor"))},"Ctrl-X Ctrl-S":"save","Ctrl-X Ctrl-W":"save","Ctrl-X S":"saveAll","Ctrl-X F":"open","Ctrl-X U":p("undo"),"Ctrl-X K":"close","Ctrl-X Delete":function(a){g(a,a.getCursor(),m(a,a.getCursor(),1),!0)},"Ctrl-X H":"selectAll","Ctrl-Q Tab":p("insertTab"),"Ctrl-U":y}),M={"Ctrl-G":w},N=0;N<10;++N)G(String(N));G("-")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/keymap/sublime.min.js b/media/editors/codemirror/keymap/sublime.min.js
index f6668d7273a0e..c3b0be5d80aa0 100644
--- a/media/editors/codemirror/keymap/sublime.min.js
+++ b/media/editors/codemirror/keymap/sublime.min.js
@@ -1 +1 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/edit/matchbrackets")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/edit/matchbrackets"],a):a(CodeMirror)}(function(a){"use strict";function b(b,c,d){if(0>d&&0==c.ch)return b.clipPos(m(c.line-1));var e=b.getLine(c.line);if(d>0&&c.ch>=e.length)return b.clipPos(m(c.line+1,0));for(var f,g="start",h=c.ch,i=0>d?0:e.length,j=0;h!=i;h+=d,j++){var k=e.charAt(0>d?h-1:h),l="_"!=k&&a.isWordChar(k)?"w":"o";if("w"==l&&k.toUpperCase()==k&&(l="W"),"start"==g)"o"!=l&&(g="in",f=l);else if("in"==g&&f!=l){if("w"==f&&"W"==l&&0>d&&h--,"W"==f&&"w"==l&&d>0){f="w";continue}break}}return m(c.line,h)}function c(a,c){a.extendSelectionsBy(function(d){return a.display.shift||a.doc.extend||d.empty()?b(a.doc,d.head,c):0>c?d.from():d.to()})}function d(b,c){return b.isReadOnly()?a.Pass:(b.operation(function(){for(var a=b.listSelections().length,d=[],e=-1,f=0;a>f;f++){var g=b.listSelections()[f].head;if(!(g.line<=e)){var h=m(g.line+(c?0:1),0);b.replaceRange("\n",h,null,"+insertLine"),b.indentLine(h.line,null,!0),d.push({head:h,anchor:h}),e=g.line+1}}b.setSelections(d)}),void b.execCommand("indentAuto"))}function e(b,c){for(var d=c.ch,e=d,f=b.getLine(c.line);d&&a.isWordChar(f.charAt(d-1));)--d;for(;ea?-1:a==b?0:1}),b.replaceRange(k,i,j),d&&a.push({anchor:i,head:j})}d&&b.setSelections(a,0)})}function h(b,c){b.operation(function(){for(var d=b.listSelections(),f=[],g=[],h=0;h=0;h--){var i=d[f[h]];if(!(j&&a.cmpPos(i.head,j)>0)){var k=e(b,i.head);j=k.from,b.replaceRange(c(k.word),k.from,k.to)}}})}function i(b){var c=b.getCursor("from"),d=b.getCursor("to");if(0==a.cmpPos(c,d)){var f=e(b,c);if(!f.word)return;c=f.from,d=f.to}return{from:c,to:d,query:b.getRange(c,d),word:f}}function j(a,b){var c=i(a);if(c){var d=c.query,e=a.getSearchCursor(d,b?c.to:c.from);(b?e.findNext():e.findPrevious())?a.setSelection(e.from(),e.to()):(e=a.getSearchCursor(d,b?m(a.firstLine(),0):a.clipPos(m(a.lastLine()))),(b?e.findNext():e.findPrevious())?a.setSelection(e.from(),e.to()):c.word&&a.setSelection(c.from,c.to))}}var k=a.keyMap.sublime={fallthrough:"default"},l=a.commands,m=a.Pos,n=a.keyMap["default"]==a.keyMap.macDefault,o=n?"Cmd-":"Ctrl-",p=n?"Ctrl-":"Alt-";l[k[p+"Left"]="goSubwordLeft"]=function(a){c(a,-1)},l[k[p+"Right"]="goSubwordRight"]=function(a){c(a,1)},n&&(k["Cmd-Left"]="goLineStartSmart");var q=n?"Ctrl-Alt-":"Ctrl-";l[k[q+"Up"]="scrollLineUp"]=function(a){var b=a.getScrollInfo();if(!a.somethingSelected()){var c=a.lineAtHeight(b.top+b.clientHeight,"local");a.getCursor().line>=c&&a.execCommand("goLineUp")}a.scrollTo(null,b.top-a.defaultTextHeight())},l[k[q+"Down"]="scrollLineDown"]=function(a){var b=a.getScrollInfo();if(!a.somethingSelected()){var c=a.lineAtHeight(b.top,"local")+1;a.getCursor().line<=c&&a.execCommand("goLineDown")}a.scrollTo(null,b.top+a.defaultTextHeight())},l[k["Shift-"+o+"L"]="splitSelectionByLine"]=function(a){for(var b=a.listSelections(),c=[],d=0;de.line&&g==f.line&&0==f.ch||c.push({anchor:g==e.line?e:m(g,0),head:g==f.line?f:m(g)});a.setSelections(c,0)},k["Shift-Tab"]="indentLess",l[k.Esc="singleSelectionTop"]=function(a){var b=a.listSelections()[0];a.setSelection(b.anchor,b.head,{scroll:!1})},l[k[o+"L"]="selectLine"]=function(a){for(var b=a.listSelections(),c=[],d=0;de?d.push(i,j):d.length&&(d[d.length-1]=j),e=j}b.operation(function(){for(var a=0;ab.lastLine()?b.replaceRange("\n"+g,m(b.lastLine()),null,"+swapLine"):b.replaceRange(g+"\n",m(e,0),null,"+swapLine")}b.setSelections(f),b.scrollIntoView()})},l[k[s+"Down"]="swapLineDown"]=function(b){if(b.isReadOnly())return a.Pass;for(var c=b.listSelections(),d=[],e=b.lastLine()+1,f=c.length-1;f>=0;f--){var g=c[f],h=g.to().line+1,i=g.from().line;0!=g.to().ch||g.empty()||h--,e>h?d.push(h,i):d.length&&(d[d.length-1]=i),e=i}b.operation(function(){for(var a=d.length-2;a>=0;a-=2){var c=d[a],e=d[a+1],f=b.getLine(c);c==b.lastLine()?b.replaceRange("",m(c-1),m(c),"+swapLine"):b.replaceRange("",m(c,0),m(c+1,0),"+swapLine"),b.replaceRange(f+"\n",m(e,0),null,"+swapLine")}b.scrollIntoView()})},l[k[o+"/"]="toggleCommentIndented"]=function(a){a.toggleComment({indent:!0})},l[k[o+"J"]="joinLines"]=function(a){for(var b=a.listSelections(),c=[],d=0;dc;c++){var d=a.listSelections()[c];d.empty()?a.replaceRange(a.getLine(d.head.line)+"\n",m(d.head.line,0)):a.replaceRange(a.getRange(d.from(),d.to()),d.from())}a.scrollIntoView()})},k[o+"T"]="transposeChars",l[k.F9="sortLines"]=function(a){g(a,!0)},l[k[o+"F9"]="sortLinesInsensitive"]=function(a){g(a,!1)},l[k.F2="nextBookmark"]=function(a){var b=a.state.sublimeBookmarks;if(b)for(;b.length;){var c=b.shift(),d=c.find();if(d)return b.push(c),a.setSelection(d.from,d.to)}},l[k["Shift-F2"]="prevBookmark"]=function(a){var b=a.state.sublimeBookmarks;if(b)for(;b.length;){b.unshift(b.pop());var c=b[b.length-1].find();if(c)return a.setSelection(c.from,c.to);b.pop()}},l[k[o+"F2"]="toggleBookmark"]=function(a){for(var b=a.listSelections(),c=a.state.sublimeBookmarks||(a.state.sublimeBookmarks=[]),d=0;d=0;e--){var f=c[e].head,g=b.getRange({line:f.line,ch:0},f),h=a.countColumn(g,null,b.getOption("tabSize")),i=b.findPosH(f,-1,"char",!1);if(g&&!/\S/.test(g)&&h%d==0){var j=new m(f.line,a.findColumn(g,h-d,d));j.ch!=f.ch&&(i=j)}b.replaceRange("",i,f,"+delete")}})},l[k[t+o+"K"]="delLineRight"]=function(a){a.operation(function(){for(var b=a.listSelections(),c=b.length-1;c>=0;c--)a.replaceRange("",b[c].anchor,m(b[c].to().line),"+delete");a.scrollIntoView()})},l[k[t+o+"U"]="upcaseAtCursor"]=function(a){h(a,function(a){return a.toUpperCase()})},l[k[t+o+"L"]="downcaseAtCursor"]=function(a){h(a,function(a){return a.toLowerCase()})},l[k[t+o+"Space"]="setSublimeMark"]=function(a){a.state.sublimeMark&&a.state.sublimeMark.clear(),a.state.sublimeMark=a.setBookmark(a.getCursor())},l[k[t+o+"A"]="selectToSublimeMark"]=function(a){var b=a.state.sublimeMark&&a.state.sublimeMark.find();b&&a.setSelection(a.getCursor(),b)},l[k[t+o+"W"]="deleteToSublimeMark"]=function(b){var c=b.state.sublimeMark&&b.state.sublimeMark.find();if(c){var d=b.getCursor(),e=c;if(a.cmpPos(d,e)>0){var f=e;e=d,d=f}b.state.sublimeKilled=b.getRange(d,e),b.replaceRange("",d,e)}},l[k[t+o+"X"]="swapWithSublimeMark"]=function(a){var b=a.state.sublimeMark&&a.state.sublimeMark.find();b&&(a.state.sublimeMark.clear(),a.state.sublimeMark=a.setBookmark(a.getCursor()),a.setCursor(b))},l[k[t+o+"Y"]="sublimeYank"]=function(a){null!=a.state.sublimeKilled&&a.replaceSelection(a.state.sublimeKilled,null,"paste")},k[t+o+"G"]="clearBookmarks",l[k[t+o+"C"]="showInCenter"]=function(a){var b=a.cursorCoords(null,"local");a.scrollTo(null,(b.top+b.bottom)/2-a.getScrollInfo().clientHeight/2)};var u=n?"Ctrl-Shift-":"Ctrl-Alt-";l[k[u+"Up"]="selectLinesUpward"]=function(a){a.operation(function(){for(var b=a.listSelections(),c=0;ca.firstLine()&&a.addSelection(m(d.head.line-1,d.head.ch))}})},l[k[u+"Down"]="selectLinesDownward"]=function(a){a.operation(function(){for(var b=a.listSelections(),c=0;c0&&c.ch>=e.length)return b.clipPos(m(c.line+1,0));for(var f,g="start",h=c.ch,i=d<0?0:e.length,j=0;h!=i;h+=d,j++){var k=e.charAt(d<0?h-1:h),l="_"!=k&&a.isWordChar(k)?"w":"o";if("w"==l&&k.toUpperCase()==k&&(l="W"),"start"==g)"o"!=l&&(g="in",f=l);else if("in"==g&&f!=l){if("w"==f&&"W"==l&&d<0&&h--,"W"==f&&"w"==l&&d>0){f="w";continue}break}}return m(c.line,h)}function c(a,c){a.extendSelectionsBy((function(d){return a.display.shift||a.doc.extend||d.empty()?b(a.doc,d.head,c):c<0?d.from():d.to()}))}function d(b,c){return b.isReadOnly()?a.Pass:(b.operation((function(){for(var a=b.listSelections().length,d=[],e=-1,f=0;f=0;h--){var i=d[f[h]];if(!(j&&a.cmpPos(i.head,j)>0)){var k=e(b,i.head);j=k.from,b.replaceRange(c(k.word),k.from,k.to)}}}))}function i(b){var c=b.getCursor("from"),d=b.getCursor("to");if(0==a.cmpPos(c,d)){var f=e(b,c);if(!f.word)return;c=f.from,d=f.to}return{from:c,to:d,query:b.getRange(c,d),word:f}}function j(a,b){var c=i(a);if(c){var d=c.query,e=a.getSearchCursor(d,b?c.to:c.from);(b?e.findNext():e.findPrevious())?a.setSelection(e.from(),e.to()):(e=a.getSearchCursor(d,b?m(a.firstLine(),0):a.clipPos(m(a.lastLine()))),(b?e.findNext():e.findPrevious())?a.setSelection(e.from(),e.to()):c.word&&a.setSelection(c.from,c.to))}}var k=a.keyMap.sublime={fallthrough:"default"},l=a.commands,m=a.Pos,n=a.keyMap.default==a.keyMap.macDefault,o=n?"Cmd-":"Ctrl-",p=n?"Ctrl-":"Alt-";l[k[p+"Left"]="goSubwordLeft"]=function(a){c(a,-1)},l[k[p+"Right"]="goSubwordRight"]=function(a){c(a,1)},n&&(k["Cmd-Left"]="goLineStartSmart");var q=n?"Ctrl-Alt-":"Ctrl-";l[k[q+"Up"]="scrollLineUp"]=function(a){var b=a.getScrollInfo();if(!a.somethingSelected()){var c=a.lineAtHeight(b.top+b.clientHeight,"local");a.getCursor().line>=c&&a.execCommand("goLineUp")}a.scrollTo(null,b.top-a.defaultTextHeight())},l[k[q+"Down"]="scrollLineDown"]=function(a){var b=a.getScrollInfo();if(!a.somethingSelected()){var c=a.lineAtHeight(b.top,"local")+1;a.getCursor().line<=c&&a.execCommand("goLineDown")}a.scrollTo(null,b.top+a.defaultTextHeight())},l[k["Shift-"+o+"L"]="splitSelectionByLine"]=function(a){for(var b=a.listSelections(),c=[],d=0;de.line&&g==f.line&&0==f.ch||c.push({anchor:g==e.line?e:m(g,0),head:g==f.line?f:m(g)});a.setSelections(c,0)},k["Shift-Tab"]="indentLess",l[k.Esc="singleSelectionTop"]=function(a){var b=a.listSelections()[0];a.setSelection(b.anchor,b.head,{scroll:!1})},l[k[o+"L"]="selectLine"]=function(a){for(var b=a.listSelections(),c=[],d=0;de?d.push(i,j):d.length&&(d[d.length-1]=j),e=j}b.operation((function(){for(var a=0;ab.lastLine()?b.replaceRange("\n"+g,m(b.lastLine()),null,"+swapLine"):b.replaceRange(g+"\n",m(e,0),null,"+swapLine")}b.setSelections(f),b.scrollIntoView()}))},l[k[s+"Down"]="swapLineDown"]=function(b){if(b.isReadOnly())return a.Pass;for(var c=b.listSelections(),d=[],e=b.lastLine()+1,f=c.length-1;f>=0;f--){var g=c[f],h=g.to().line+1,i=g.from().line;0!=g.to().ch||g.empty()||h--,h=0;a-=2){var c=d[a],e=d[a+1],f=b.getLine(c);c==b.lastLine()?b.replaceRange("",m(c-1),m(c),"+swapLine"):b.replaceRange("",m(c,0),m(c+1,0),"+swapLine"),b.replaceRange(f+"\n",m(e,0),null,"+swapLine")}b.scrollIntoView()}))},l[k[o+"/"]="toggleCommentIndented"]=function(a){a.toggleComment({indent:!0})},l[k[o+"J"]="joinLines"]=function(a){for(var b=a.listSelections(),c=[],d=0;d=0;e--){var f=c[e].head,g=b.getRange({line:f.line,ch:0},f),h=a.countColumn(g,null,b.getOption("tabSize")),i=b.findPosH(f,-1,"char",!1);if(g&&!/\S/.test(g)&&h%d==0){var j=new m(f.line,a.findColumn(g,h-d,d));j.ch!=f.ch&&(i=j)}b.replaceRange("",i,f,"+delete")}}))},l[k[t+o+"K"]="delLineRight"]=function(a){a.operation((function(){for(var b=a.listSelections(),c=b.length-1;c>=0;c--)a.replaceRange("",b[c].anchor,m(b[c].to().line),"+delete");a.scrollIntoView()}))},l[k[t+o+"U"]="upcaseAtCursor"]=function(a){h(a,(function(a){return a.toUpperCase()}))},l[k[t+o+"L"]="downcaseAtCursor"]=function(a){h(a,(function(a){return a.toLowerCase()}))},l[k[t+o+"Space"]="setSublimeMark"]=function(a){a.state.sublimeMark&&a.state.sublimeMark.clear(),a.state.sublimeMark=a.setBookmark(a.getCursor())},l[k[t+o+"A"]="selectToSublimeMark"]=function(a){var b=a.state.sublimeMark&&a.state.sublimeMark.find();b&&a.setSelection(a.getCursor(),b)},l[k[t+o+"W"]="deleteToSublimeMark"]=function(b){var c=b.state.sublimeMark&&b.state.sublimeMark.find();if(c){var d=b.getCursor(),e=c;if(a.cmpPos(d,e)>0){var f=e;e=d,d=f}b.state.sublimeKilled=b.getRange(d,e),b.replaceRange("",d,e)}},l[k[t+o+"X"]="swapWithSublimeMark"]=function(a){var b=a.state.sublimeMark&&a.state.sublimeMark.find();b&&(a.state.sublimeMark.clear(),a.state.sublimeMark=a.setBookmark(a.getCursor()),a.setCursor(b))},l[k[t+o+"Y"]="sublimeYank"]=function(a){null!=a.state.sublimeKilled&&a.replaceSelection(a.state.sublimeKilled,null,"paste")},k[t+o+"G"]="clearBookmarks",l[k[t+o+"C"]="showInCenter"]=function(a){var b=a.cursorCoords(null,"local");a.scrollTo(null,(b.top+b.bottom)/2-a.getScrollInfo().clientHeight/2)};var u=n?"Ctrl-Shift-":"Ctrl-Alt-";l[k[u+"Up"]="selectLinesUpward"]=function(a){a.operation((function(){for(var b=a.listSelections(),c=0;ca.firstLine()&&a.addSelection(m(d.head.line-1,d.head.ch))}}))},l[k[u+"Down"]="selectLinesDownward"]=function(a){a.operation((function(){for(var b=a.listSelections(),c=0;c",type:"keyToKey",toKeys:"h"},{keys:"",type:"keyToKey",toKeys:"l"},{keys:"",type:"keyToKey",toKeys:"k"},{keys:"",type:"keyToKey",toKeys:"j"},{keys:"",type:"keyToKey",toKeys:"l"},{keys:"",type:"keyToKey",toKeys:"h",context:"normal"},{keys:"",type:"keyToKey",toKeys:"W"},{keys:"",type:"keyToKey",toKeys:"B",context:"normal"},{keys:"",type:"keyToKey",toKeys:"w"},{keys:"",type:"keyToKey",toKeys:"b",context:"normal"},{keys:"",type:"keyToKey",toKeys:"j"},{keys:"",type:"keyToKey",toKeys:"k"},{keys:"",type:"keyToKey",toKeys:""},{keys:"",type:"keyToKey",toKeys:""},{keys:"",type:"keyToKey",toKeys:"",context:"insert"},{keys:"",type:"keyToKey",toKeys:"",context:"insert"},{keys:"s",type:"keyToKey",toKeys:"cl",context:"normal"},{keys:"s",type:"keyToKey",toKeys:"c",context:"visual"},{keys:"S",type:"keyToKey",toKeys:"cc",context:"normal"},{keys:"S",type:"keyToKey",toKeys:"VdO",context:"visual"},{keys:"",type:"keyToKey",toKeys:"0"},{keys:"",type:"keyToKey",toKeys:"$"},{keys:"",type:"keyToKey",toKeys:""},{keys:"",type:"keyToKey",toKeys:""},{keys:"",type:"keyToKey",toKeys:"j^",context:"normal"},{keys:"",type:"action",action:"toggleOverwrite",context:"insert"},{keys:"H",type:"motion",motion:"moveToTopLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"M",type:"motion",motion:"moveToMiddleLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"L",type:"motion",motion:"moveToBottomLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"h",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!1}},{keys:"l",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!0}},{keys:"j",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,linewise:!0}},{keys:"k",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,linewise:!0}},{keys:"gj",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!0}},{keys:"gk",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!1}},{keys:"w",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1}},{keys:"W",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1,bigWord:!0}},{keys:"e",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,inclusive:!0}},{keys:"E",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"b",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1}},{keys:"B",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1,bigWord:!0}},{keys:"ge",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,inclusive:!0}},{keys:"gE",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"{",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!1,toJumplist:!0}},{keys:"}",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!0,toJumplist:!0}},{keys:"",type:"motion",motion:"moveByPage",motionArgs:{forward:!0}},{keys:"",type:"motion",motion:"moveByPage",motionArgs:{forward:!1}},{keys:"",type:"motion",motion:"moveByScroll",motionArgs:{forward:!0,explicitRepeat:!0}},{keys:"",type:"motion",motion:"moveByScroll",motionArgs:{forward:!1,explicitRepeat:!0}},{keys:"gg",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"G",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!0,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"0",type:"motion",motion:"moveToStartOfLine"},{keys:"^",type:"motion",motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"+",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0}},{keys:"-",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,toFirstChar:!0}},{keys:"_",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0,repeatOffset:-1}},{keys:"$",type:"motion",motion:"moveToEol",motionArgs:{inclusive:!0}},{keys:"%",type:"motion",motion:"moveToMatchedSymbol",motionArgs:{inclusive:!0,toJumplist:!0}},{keys:"f",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"F",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!1}},{keys:"t",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"T",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!1}},{keys:";",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!0}},{keys:",",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!1}},{keys:"'",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0,linewise:!0}},{keys:"`",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0}},{keys:"]`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0}},{keys:"[`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1}},{keys:"]'",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0,linewise:!0}},{keys:"['",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1,linewise:!0}},{keys:"]p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0,matchIndent:!0}},{keys:"[p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0,matchIndent:!0}},{keys:"]",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!0,toJumplist:!0}},{keys:"[",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!1,toJumplist:!0}},{keys:"|",type:"motion",motion:"moveToColumn"},{keys:"o",type:"motion",motion:"moveToOtherHighlightedEnd",context:"visual"},{keys:"O",type:"motion",motion:"moveToOtherHighlightedEnd",motionArgs:{sameLine:!0},context:"visual"},{keys:"d",type:"operator",operator:"delete"},{keys:"y",type:"operator",operator:"yank"},{keys:"c",type:"operator",operator:"change"},{keys:">",type:"operator",operator:"indent",operatorArgs:{indentRight:!0}},{keys:"<",type:"operator",operator:"indent",operatorArgs:{indentRight:!1}},{keys:"g~",type:"operator",operator:"changeCase"},{keys:"gu",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},isEdit:!0},{keys:"gU",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},isEdit:!0},{keys:"n",type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:!0}},{keys:"N",type:"motion",motion:"findNext",motionArgs:{forward:!1,toJumplist:!0}},{keys:"x",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!0},operatorMotionArgs:{visualLine:!1}},{keys:"X",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!1},operatorMotionArgs:{visualLine:!0}},{keys:"D",type:"operatorMotion",operator:"delete",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"D",type:"operator",operator:"delete",operatorArgs:{linewise:!0},context:"visual"},{keys:"Y",type:"operatorMotion",operator:"yank",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"Y",type:"operator",operator:"yank",operatorArgs:{linewise:!0},context:"visual"},{keys:"C",type:"operatorMotion",operator:"change",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"C",type:"operator",operator:"change",operatorArgs:{linewise:!0},context:"visual"},{keys:"~",type:"operatorMotion",operator:"changeCase",motion:"moveByCharacters",motionArgs:{forward:!0},operatorArgs:{shouldMoveCursor:!0},context:"normal"},{keys:"~",type:"operator",operator:"changeCase",context:"visual"},{keys:"",type:"operatorMotion",operator:"delete",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1},context:"insert"},{keys:"",type:"action",action:"jumpListWalk",actionArgs:{forward:!0}},{keys:"",type:"action",action:"jumpListWalk",actionArgs:{forward:!1}},{keys:"",type:"action",action:"scroll",actionArgs:{forward:!0,linewise:!0}},{keys:"",type:"action",action:"scroll",actionArgs:{forward:!1,linewise:!0}},{keys:"a",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"charAfter"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"eol"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"endOfSelectedArea"},context:"visual"},{keys:"i",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"inplace"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"firstNonBlank"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"startOfSelectedArea"},context:"visual"},{keys:"o",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!0},context:"normal"},{keys:"O",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!1},context:"normal"},{keys:"v",type:"action",action:"toggleVisualMode"},{keys:"V",type:"action",action:"toggleVisualMode",actionArgs:{linewise:!0}},{keys:"",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"gv",type:"action",action:"reselectLastSelection"},{keys:"J",type:"action",action:"joinLines",isEdit:!0},{keys:"p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0}},{keys:"P",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0}},{keys:"r",type:"action",action:"replace",isEdit:!0},{keys:"@",type:"action",action:"replayMacro"},{keys:"q",type:"action",action:"enterMacroRecordMode"},{keys:"R",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{replace:!0}},{keys:"u",type:"action",action:"undo",context:"normal"},{keys:"u",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},context:"visual",isEdit:!0},{keys:"U",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},context:"visual",isEdit:!0},{keys:"",type:"action",action:"redo"},{keys:"m",type:"action",action:"setMark"},{keys:'"',type:"action",action:"setRegister"},{keys:"zz",type:"action",action:"scrollToCursor",actionArgs:{position:"center"}},{keys:"z.",type:"action",action:"scrollToCursor",actionArgs:{position:"center"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"zt",type:"action",action:"scrollToCursor",actionArgs:{position:"top"}},{keys:"z",type:"action",action:"scrollToCursor",actionArgs:{position:"top"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"z-",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"}},{keys:"zb",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:".",type:"action",action:"repeatLastEdit"},{keys:"",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!0,backtrack:!1}},{keys:"",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!1,backtrack:!1}},{keys:"a",type:"motion",motion:"textObjectManipulation"},{keys:"i
-
-
-
@@ -46,8 +46,8 @@
-
get('show_create_date')) : ?>
diff --git a/layouts/joomla/content/intro_image.php b/layouts/joomla/content/intro_image.php
index b3cc17651e2d4..77c6460118945 100644
--- a/layouts/joomla/content/intro_image.php
+++ b/layouts/joomla/content/intro_image.php
@@ -12,7 +12,7 @@
?>
images); ?>
image_intro) && !empty($images->image_intro)) : ?>
- float_intro)) ? $params->get('float_intro') : $images->float_intro; ?>
+ float_intro) ? $params->get('float_intro') : $images->float_intro; ?>
get('link_titles') && $params->get('access-view')) : ?>
language == '') +{ + echo JText::_('JDEFAULT'); +} +elseif ($item->language == '*') +{ + echo JText::alt('JALL', 'language'); +} +elseif ($item->language_image) +{ + echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, null, true) . ' ' . htmlspecialchars($item->language_title, ENT_COMPAT, 'UTF-8'); +} +elseif ($item->language_title) +{ + echo htmlspecialchars($item->language_title, ENT_COMPAT, 'UTF-8'); +} +else +{ + echo JText::_('JUNDEFINED'); +} diff --git a/layouts/joomla/content/options_default.php b/layouts/joomla/content/options_default.php index 04df19d2b90dd..83e96a8817000 100644 --- a/layouts/joomla/content/options_default.php +++ b/layouts/joomla/content/options_default.php @@ -39,7 +39,7 @@ $showonarr[] = array( 'field' => $displayData->form->getFormControl() . '[' . $displayData->form->getFieldAttribute($showon[0], 'name') . ']', 'values' => explode(',', $showon[1]), - 'op' => (preg_match('%\[(AND|OR)\]' . $showonfield . '%', $showonstring, $matches)) ? $matches[1] : '' + 'op' => preg_match('%\[(AND|OR)\]' . $showonfield . '%', $showonstring, $matches) ? $matches[1] : '' ); } diff --git a/layouts/joomla/content/readmore.php b/layouts/joomla/content/readmore.php index 1a66d0640f0eb..be5227e39e7fa 100644 --- a/layouts/joomla/content/readmore.php +++ b/layouts/joomla/content/readmore.php @@ -21,13 +21,13 @@ elseif ($readmore = $item->alternative_readmore) : echo $readmore; if ($params->get('show_readmore_title', 0) != 0) : - echo JHtml::_('string.truncate', ($item->title), $params->get('readmore_limit')); + echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); endif; elseif ($params->get('show_readmore_title', 0) == 0) : echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE'); else : echo JText::_('COM_CONTENT_READ_MORE'); - echo JHtml::_('string.truncate', ($item->title), $params->get('readmore_limit')); + echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); endif; ?> diff --git a/layouts/joomla/edit/associations.php b/layouts/joomla/edit/associations.php index b921a18edcf69..62229972698f3 100644 --- a/layouts/joomla/edit/associations.php +++ b/layouts/joomla/edit/associations.php @@ -10,7 +10,7 @@ defined('JPATH_BASE') or die; // JLayout for standard handling of associations fields in the administrator items edit screens. -if ($displayData->getForm()->getValue('id') != 0 && $displayData->getForm()->getValue('language') != "*") +if ($displayData->getForm()->getValue('id') != 0 && $displayData->getForm()->getValue('language') !== '*') { echo $displayData->getForm()->renderFieldset('item_associations'); } diff --git a/layouts/joomla/edit/frontediting_modules.php b/layouts/joomla/edit/frontediting_modules.php index 64cb3ccea6361..74a52d35b8fd3 100644 --- a/layouts/joomla/edit/frontediting_modules.php +++ b/layouts/joomla/edit/frontediting_modules.php @@ -28,7 +28,7 @@ // Add css class jmoddiv and data attributes for module-editing URL and for the tooltip: $editUrl = JUri::base() . 'administrator/index.php?option=com_modules&task=module.edit&id=' . (int) $mod->id; -if ($parameters->get('redirect_edit', 'site') == 'site') +if ($parameters->get('redirect_edit', 'site') === 'site') { $editUrl = JUri::base() . 'index.php?option=com_config&controller=config.display.modules&id=' . (int) $mod->id . $redirectUri; $target = '_self'; @@ -48,7 +48,7 @@ ) . '"' // And if menu editing is enabled and allowed and it's a menu module, add data attributes for menu editing: - . ($menusEditing && $mod->module == 'mod_menu' ? + . ($menusEditing && $mod->module === 'mod_menu' ? '" data-jmenuedittip="' . JHtml::tooltipText('JLIB_HTML_EDIT_MENU_ITEM', 'JLIB_HTML_EDIT_MENU_ITEM_ID') . '"' : '' diff --git a/layouts/joomla/edit/global.php b/layouts/joomla/edit/global.php index a88ed84c74152..0abcfc5986511 100644 --- a/layouts/joomla/edit/global.php +++ b/layouts/joomla/edit/global.php @@ -14,7 +14,7 @@ $input = $app->input; $component = $input->getCmd('option', 'com_content'); -if ($component == 'com_categories') +if ($component === 'com_categories') { $extension = $input->getCmd('extension', 'com_content'); $parts = explode('.', $extension); diff --git a/layouts/joomla/edit/metadata.php b/layouts/joomla/edit/metadata.php index b1cc161d5b4c0..67f8fc349dfe3 100644 --- a/layouts/joomla/edit/metadata.php +++ b/layouts/joomla/edit/metadata.php @@ -22,7 +22,7 @@ renderField('metadesc'); echo $form->renderField('metakey'); @@ -31,7 +31,7 @@ foreach ($form->getFieldset($name) as $field) { - if ($field->name != 'jform[metadata][tags][]') + if ($field->name !== 'jform[metadata][tags][]') { echo $field->renderField(); } diff --git a/layouts/joomla/edit/params.php b/layouts/joomla/edit/params.php index 17095fb368413..69f6a545b3d57 100644 --- a/layouts/joomla/edit/params.php +++ b/layouts/joomla/edit/params.php @@ -39,9 +39,10 @@ foreach ($fieldSets as $name => $fieldSet) { // Ensure any fieldsets we don't want to show are skipped (including repeating formfield fieldsets) - if (in_array($name, $ignoreFieldsets) || (!empty($configFieldsets) && in_array($name, $configFieldsets)) - || !empty($hiddenFieldsets) && in_array($name, $hiddenFieldsets) - || (isset($fieldSet->repeat) && $fieldSet->repeat == true) + if ((isset($fieldSet->repeat) && $fieldSet->repeat == true) + || in_array($name, $ignoreFieldsets) + || (!empty($configFieldsets) && in_array($name, $configFieldsets)) + || (!empty($hiddenFieldsets) && in_array($name, $hiddenFieldsets)) ) { continue; @@ -54,7 +55,7 @@ else { $label = strtoupper('JGLOBAL_FIELDSET_' . $name); - if (JText::_($label) == $label) + if (JText::_($label) === $label) { $label = strtoupper($app->input->get('option') . '_' . $name . '_FIELDSET_LABEL'); } diff --git a/layouts/joomla/editors/buttons/button.php b/layouts/joomla/editors/buttons/button.php index 43c3ef278f35d..c8a989724c7aa 100644 --- a/layouts/joomla/editors/buttons/button.php +++ b/layouts/joomla/editors/buttons/button.php @@ -14,11 +14,11 @@ ?> get('name')) : ?> get('class')) ? $button->get('class') : null; - $class .= ($button->get('modal')) ? ' modal-button' : null; - $href = ($button->get('link')) ? ' href="' . JUri::base() . $button->get('link') . '"' : null; - $onclick = ($button->get('onclick')) ? ' onclick="' . $button->get('onclick') . '"' : ''; - $title = ($button->get('title')) ? $button->get('title') : $button->get('text'); + $class = $button->get('class') ?: null; + $class .= $button->get('modal') ? ' modal-button' : null; + $href = $button->get('link') ? ' href="' . JUri::base() . $button->get('link') . '"' : null; + $onclick = $button->get('onclick') ? ' onclick="' . $button->get('onclick') . '"' : ''; + $title = $button->get('title') ?: $button->get('text'); // Load modal popup behavior if ($button->get('modal')) diff --git a/layouts/joomla/form/field/file.php b/layouts/joomla/form/field/file.php index 4100a3ad501b7..0d3d8c93af853 100644 --- a/layouts/joomla/form/field/file.php +++ b/layouts/joomla/form/field/file.php @@ -48,6 +48,8 @@ // Including fallback code for HTML5 non supported browsers. JHtml::_('jquery.framework'); JHtml::_('script', 'system/html5fallback.js', false, true); + +$maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize()); ?> - /> + />
+ diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php index b44d7eca36186..dab5041ff5516 100644 --- a/layouts/joomla/form/field/media.php +++ b/layouts/joomla/form/field/media.php @@ -170,8 +170,7 @@ ?> > diff --git a/layouts/joomla/form/field/radio.php b/layouts/joomla/form/field/radio.php index 0f792ffc96261..d8dd181dd7439 100644 --- a/layouts/joomla/form/field/radio.php +++ b/layouts/joomla/form/field/radio.php @@ -63,7 +63,7 @@ $option) : ?> value == $value) ? 'checked="checked"' : ''; + $checked = ((string) $option->value === $value) ? 'checked="checked"' : ''; $optionClass = !empty($option->class) ? 'class="' . $option->class . '"' : ''; $disabled = !empty($option->disable) || ($disabled && !$checked) ? 'disabled' : ''; diff --git a/layouts/joomla/form/field/user.php b/layouts/joomla/form/field/user.php index 37283b6c2d483..dded74d19a554 100644 --- a/layouts/joomla/form/field/user.php +++ b/layouts/joomla/form/field/user.php @@ -52,9 +52,9 @@ . (isset($excluded) ? ('&excluded=' . base64_encode(json_encode($excluded))) : ''); // Invalidate the input value if no user selected -if (JText::_('JLIB_FORM_SELECT_USER') == htmlspecialchars($userName, ENT_COMPAT, 'UTF-8')) +if (JText::_('JLIB_FORM_SELECT_USER') === htmlspecialchars($userName, ENT_COMPAT, 'UTF-8')) { - $userName = ""; + $userName = ''; } // Load the modal behavior script. diff --git a/layouts/joomla/form/renderlabel.php b/layouts/joomla/form/renderlabel.php index ecc6556c1df39..05ee30100d2cf 100644 --- a/layouts/joomla/form/renderlabel.php +++ b/layouts/joomla/form/renderlabel.php @@ -29,14 +29,14 @@ if (!empty($description)) { - if ($text && $text != $description) + if ($text && $text !== $description) { JHtml::_('bootstrap.popover'); $classes[] = 'hasPopover'; $title = ' title="' . htmlspecialchars(trim($text, ':')) . '"' . ' data-content="'. htmlspecialchars($description) . '"'; - if (JFactory::getLanguage()->isRtl() && !$position) + if (!$position && JFactory::getLanguage()->isRtl()) { $position = ' data-placement="left" '; } diff --git a/layouts/joomla/pagination/link.php b/layouts/joomla/pagination/link.php index 93a02edc72076..b7868e894f875 100644 --- a/layouts/joomla/pagination/link.php +++ b/layouts/joomla/pagination/link.php @@ -18,23 +18,23 @@ { // Check for "Start" item case JText::_('JLIB_HTML_START') : - $icon = "icon-backward icon-first"; + $icon = 'icon-backward icon-first'; break; // Check for "Prev" item - case $item->text == JText::_('JPREV') : + case $item->text === JText::_('JPREV') : $item->text = JText::_('JPREVIOUS'); - $icon = "icon-step-backward icon-previous"; + $icon = 'icon-step-backward icon-previous'; break; // Check for "Next" item case JText::_('JNEXT') : - $icon = "icon-step-forward icon-next"; + $icon = 'icon-step-forward icon-next'; break; // Check for "End" item case JText::_('JLIB_HTML_END') : - $icon = "icon-forward icon-last"; + $icon = 'icon-forward icon-last'; break; default: diff --git a/layouts/joomla/pagination/links.php b/layouts/joomla/pagination/links.php index ea9f2a8dc15c6..fbc6bc65ced0b 100644 --- a/layouts/joomla/pagination/links.php +++ b/layouts/joomla/pagination/links.php @@ -38,7 +38,7 @@ if ($currentPage >= $step) { - if ($currentPage % $step == 0) + if ($currentPage % $step === 0) { $range = ceil($currentPage / $step) + 1; } @@ -66,7 +66,7 @@ - + ).*?()#', '$1...$2', $output); ?> diff --git a/layouts/joomla/searchtools/default/filters.php b/layouts/joomla/searchtools/default/filters.php index 58eb9c997a8b9..d676219f6d769 100644 --- a/layouts/joomla/searchtools/default/filters.php +++ b/layouts/joomla/searchtools/default/filters.php @@ -24,7 +24,7 @@ $showonarr[] = array( 'field' => $showon[0], 'values' => explode(',', $showon[1]), - 'op' => (preg_match('%\[(AND|OR)\]' . $showonfield . '%', $showonstring, $matches)) ? $matches[1] : '' + 'op' => preg_match('%\[(AND|OR)\]' . $showonfield . '%', $showonstring, $matches) ? $matches[1] : '' ); } $data['view']->filterForm->setFieldAttribute($field->fieldname, 'dataShowOn', json_encode($showonarr), $field->group); @@ -36,7 +36,7 @@ ?> $field) : ?> - + getAttribute('dataShowOn')) diff --git a/layouts/joomla/searchtools/grid/sort.php b/layouts/joomla/searchtools/grid/sort.php index 686d76546bf69..be337f31fcb42 100644 --- a/layouts/joomla/searchtools/grid/sort.php +++ b/layouts/joomla/searchtools/grid/sort.php @@ -11,7 +11,7 @@ $data = $displayData; -$title = htmlspecialchars(JText::_($data->tip ? $data->tip : $data->title)); +$title = htmlspecialchars(JText::_($data->tip ?: $data->title)); JHtml::_('bootstrap.popover'); ?> hide) : ?> + if ($item[1] !== '') : ?> diff --git a/layouts/joomla/tinymce/buttons.php b/layouts/joomla/tinymce/buttons.php index 59f7ce8400641..2d699e8f98f5e 100644 --- a/layouts/joomla/tinymce/buttons.php +++ b/layouts/joomla/tinymce/buttons.php @@ -11,5 +11,3 @@ JLog::add('The layout joomla.tinymce.buttons is deprecated, use joomla.editors.buttons instead.', JLog::WARNING, 'deprecated'); echo JLayoutHelper::render('joomla.editors.buttons', $displayData); - -?> diff --git a/layouts/joomla/tinymce/buttons/button.php b/layouts/joomla/tinymce/buttons/button.php index 1970c089c51af..c492b4e3cebf4 100644 --- a/layouts/joomla/tinymce/buttons/button.php +++ b/layouts/joomla/tinymce/buttons/button.php @@ -11,5 +11,3 @@ JLog::add('The layout joomla.tinymce.buttons.button is deprecated, use joomla.editors.buttons.button instead.', JLog::WARNING, 'deprecated'); echo JLayoutHelper::render('joomla.editors.buttons.button', $displayData); - -?> diff --git a/layouts/joomla/toolbar/popup.php b/layouts/joomla/toolbar/popup.php index d95ce624568fc..f7177c70a62fd 100644 --- a/layouts/joomla/toolbar/popup.php +++ b/layouts/joomla/toolbar/popup.php @@ -7,7 +7,7 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -defined('JPATH_BASE') or die;; +defined('JPATH_BASE') or die; JHtml::_('behavior.core'); diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php index dd3e2f2eec2f4..99cb0f2f8f3f1 100644 --- a/libraries/cms/application/cms.php +++ b/libraries/cms/application/cms.php @@ -145,7 +145,7 @@ public function afterSessionStart() if ($session->isNew()) { - $session->set('registry', new Registry('session')); + $session->set('registry', new Registry); $session->set('user', new JUser); } } diff --git a/libraries/cms/application/site.php b/libraries/cms/application/site.php index 1d08eb17f364d..6148ccd5b84d1 100644 --- a/libraries/cms/application/site.php +++ b/libraries/cms/application/site.php @@ -351,8 +351,7 @@ public function getParams($option = null) // Get show_page_heading from com_menu global settings $params[$hash]->def('show_page_heading', $temp->get('show_page_heading')); - $temp = new Registry; - $temp->loadString($menu->params); + $temp = new Registry($menu->params); $params[$hash]->merge($temp); $title = $menu->title; } @@ -484,9 +483,7 @@ public function getTemplate($params = false) foreach ($templates as &$template) { - $registry = new Registry; - $registry->loadString($template->params); - $template->params = $registry; + $template->params = new Registry($template->params); // Create home element if ($template->home == 1 && !isset($templates[0]) || $this->_language_filter && $template->home == $tag) @@ -521,9 +518,7 @@ public function getTemplate($params = false) { $template = $tmpl; - $registry = new Registry; - $registry->loadString($template->params); - $template->params = $registry; + $template->params = new Registry($template->params); break; } diff --git a/libraries/cms/component/helper.php b/libraries/cms/component/helper.php index 879577feb49ed..8402b4d72cc6c 100644 --- a/libraries/cms/component/helper.php +++ b/libraries/cms/component/helper.php @@ -58,9 +58,7 @@ public static function getComponent($option, $strict = false) if (is_string($result->params)) { - $temp = new Registry; - $temp->loadString(static::$components[$option]->params); - static::$components[$option]->params = $temp; + static::$components[$option]->params = new Registry(static::$components[$option]->params); } return $result; diff --git a/libraries/cms/component/router/view.php b/libraries/cms/component/router/view.php index 411522abd85c3..f21b67dbc95df 100644 --- a/libraries/cms/component/router/view.php +++ b/libraries/cms/component/router/view.php @@ -83,7 +83,7 @@ public function getPath($query) $key = false; // Get the right view object - if (isset($query['view']) && $views[$query['view']]) + if (isset($query['view']) && isset($views[$query['view']])) { $viewobj = $views[$query['view']]; } diff --git a/libraries/cms/editor/editor.php b/libraries/cms/editor/editor.php index 60a824f166dfe..f230aaa4f019b 100644 --- a/libraries/cms/editor/editor.php +++ b/libraries/cms/editor/editor.php @@ -536,8 +536,7 @@ protected function _loadEditor($config = array()) return false; } - $params = new Registry; - $params->loadString($plugin->params); + $params = new Registry($plugin->params); $params->loadArray($config); $plugin->params = $params; diff --git a/libraries/cms/helper/media.php b/libraries/cms/helper/media.php index ff48d93771d79..506ac4fdafc3b 100644 --- a/libraries/cms/helper/media.php +++ b/libraries/cms/helper/media.php @@ -63,7 +63,7 @@ public function canUpload($file, $component = 'com_media') if (empty($file['name'])) { - $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_UPLOAD_INPUT'), 'notice'); + $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_UPLOAD_INPUT'), 'error'); return false; } @@ -72,7 +72,7 @@ public function canUpload($file, $component = 'com_media') if (str_replace(' ', '', $file['name']) != $file['name'] || $file['name'] !== JFile::makeSafe($file['name'])) { - $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILENAME'), 'notice'); + $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILENAME'), 'error'); return false; } @@ -82,7 +82,7 @@ public function canUpload($file, $component = 'com_media') if (count($filetypes) < 2) { // There seems to be no extension - $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'notice'); + $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'error'); return false; } @@ -99,7 +99,7 @@ public function canUpload($file, $component = 'com_media') if (!empty($check)) { - $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'notice'); + $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'error'); return false; } @@ -110,7 +110,7 @@ public function canUpload($file, $component = 'com_media') if ($filetype == '' || $filetype == false || (!in_array($filetype, $allowable) && !in_array($filetype, $ignored))) { - $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'notice'); + $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'error'); return false; } @@ -119,7 +119,7 @@ public function canUpload($file, $component = 'com_media') if ($maxSize > 0 && (int) $file['size'] > $maxSize) { - $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETOOLARGE'), 'notice'); + $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETOOLARGE'), 'error'); return false; } @@ -136,14 +136,14 @@ public function canUpload($file, $component = 'com_media') { if (($imginfo = getimagesize($file['tmp_name'])) === false) { - $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_IMG'), 'notice'); + $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_IMG'), 'error'); return false; } } else { - $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETOOLARGE'), 'notice'); + $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILETOOLARGE'), 'error'); return false; } @@ -162,7 +162,7 @@ public function canUpload($file, $component = 'com_media') if (strlen($type) && !in_array($type, $allowed_mime) && in_array($type, $illegal_mime)) { - $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'notice'); + $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'error'); return false; } @@ -176,14 +176,14 @@ public function canUpload($file, $component = 'com_media') if (strlen($type) && !in_array($type, $allowed_mime) && in_array($type, $illegal_mime)) { - $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'notice'); + $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'error'); return false; } } elseif (!JFactory::getUser()->authorise('core.manage', $component)) { - $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNNOTADMIN'), 'notice'); + $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNNOTADMIN'), 'error'); return false; } @@ -208,7 +208,7 @@ public function canUpload($file, $component = 'com_media') // A tag is '' if (stristr($xss_check, '<' . $tag . ' ') || stristr($xss_check, '<' . $tag . '>')) { - $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNIEXSS'), 'notice'); + $app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNIEXSS'), 'error'); return false; } diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php index 502e9a416929f..55d193487f185 100644 --- a/libraries/cms/html/behavior.php +++ b/libraries/cms/html/behavior.php @@ -971,7 +971,7 @@ public static function tabstate() * Add javascript polyfills. * * @param string|array $polyfillTypes The polyfill type(s). Examples: event, array('event', 'classlist'). - * @param string $conditionalBrowser A IE conditional expression. Example: lt IE 9 (lower than IE 9). + * @param string $conditionalBrowser An IE conditional expression. Example: lt IE 9 (lower than IE 9). * * @return void * diff --git a/libraries/cms/html/email.php b/libraries/cms/html/email.php index f31f5c524573f..12bfa1be8fc69 100644 --- a/libraries/cms/html/email.php +++ b/libraries/cms/html/email.php @@ -48,7 +48,7 @@ public static function cloak($mail, $mailto = true, $text = '', $email = true) $mail = static::convertEncoding($mail); // Random hash - $rand = md5($mail . rand(1, 100000)); + $rand = md5($mail . mt_rand(1, 100000)); // Split email by @ symbol $mail = explode('@', $mail); diff --git a/libraries/cms/html/html.php b/libraries/cms/html/html.php index ecb7d1a0447d7..ee7733fa8dc7b 100644 --- a/libraries/cms/html/html.php +++ b/libraries/cms/html/html.php @@ -116,7 +116,7 @@ public static function _($key) throw new InvalidArgumentException(sprintf('%s %s not found.', $prefix, $file), 500); } - require_once $path; + JLoader::register($className, $path); if (!class_exists($className)) { @@ -707,34 +707,31 @@ public static function script($file, $options = array(), $attribs = array()) // If only path is required if ($options['pathOnly']) { - if (count($includes) == 0) + if (count($includes) === 0) { return; } - elseif (count($includes) == 1) + + if (count($includes) === 1) { return $includes[0]; } - else - { - return $includes; - } + + return $includes; } + // If inclusion is required - else - { - $document = JFactory::getDocument(); + $document = JFactory::getDocument(); - foreach ($includes as $include) + foreach ($includes as $include) + { + // If there is already a version hash in the script reference (by using deprecated MD5SUM). + if ($pos = strpos($include, '?') !== false) { - // If there is already a version hash in the script reference (by using deprecated MD5SUM). - if ($pos = strpos($include, '?') !== false) - { - $options['version'] = substr($include, $pos + 1); - } - - $document->addScript($include, $options, $attribs); + $options['version'] = substr($include, $pos + 1); } + + $document->addScript($include, $options, $attribs); } } diff --git a/libraries/cms/installer/adapter.php b/libraries/cms/installer/adapter.php index 597ba4082fe8f..7e83278af8ad0 100644 --- a/libraries/cms/installer/adapter.php +++ b/libraries/cms/installer/adapter.php @@ -912,14 +912,10 @@ protected function setupScriptfile() { $manifestScriptFile = $this->parent->getPath('source') . '/' . $manifestScript; - if (is_file($manifestScriptFile)) - { - // Load the file - include_once $manifestScriptFile; - } - $classname = $this->getScriptClassName(); + JLoader::register($classname, $manifestScriptFile); + if (class_exists($classname)) { // Create a new instance diff --git a/libraries/cms/installer/adapter/file.php b/libraries/cms/installer/adapter/file.php index f87c811156c24..545e122fe2bdd 100644 --- a/libraries/cms/installer/adapter/file.php +++ b/libraries/cms/installer/adapter/file.php @@ -341,15 +341,11 @@ public function uninstall($id) { $manifestScriptFile = $this->parent->getPath('extension_root') . '/' . $manifestScript; - if (is_file($manifestScriptFile)) - { - // Load the file - include_once $manifestScriptFile; - } - // Set the class name $classname = $row->element . 'InstallerScript'; + JLoader::register($classname, $manifestScriptFile); + if (class_exists($classname)) { // Create a new instance diff --git a/libraries/cms/installer/adapter/language.php b/libraries/cms/installer/adapter/language.php index bc4d5711ce5d8..b719ef4ce5404 100644 --- a/libraries/cms/installer/adapter/language.php +++ b/libraries/cms/installer/adapter/language.php @@ -306,33 +306,43 @@ protected function _install($cname, $basePath, $clientId, &$element) // Load the site language manifest. $siteLanguageManifest = JLanguage::parseXMLLanguageFile(JPATH_SITE . '/language/' . $this->tag . '/' . $this->tag . '.xml'); - // Set the content language title as name in site xx-XX.ini. + // Set the content language title as the language metadata name. $contentLanguageTitle = $siteLanguageManifest['name']; - // Set the content language as installation native title language variable, fallback to content language title. + // Set, as fallback, the content language native title to the language metadata name. $contentLanguageNativeTitle = $contentLanguageTitle; - if (file_exists(JPATH_INSTALLATION . '/language/' . $this->tag . '/' . $this->tag . '.xml')) + // If exist, load the native title from the language xml metadata. + if (isset($siteLanguageMetadata['nativeName']) && $siteLanguageMetadata['nativeName']) { - $installationLanguage = new JLanguage($this->tag); - $installationLanguage->load('', JPATH_INSTALLATION); + $contentLanguageNativeTitle = $siteLanguageMetadata['nativeName']; + } - if ($installationLanguage->hasKey('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME')) + // Try to load a language string from the installation language var. Will be removed in 4.0. + if ($contentLanguageNativeTitle === $contentLanguageTitle) + { + if (file_exists(JPATH_INSTALLATION . '/language/' . $this->tag . '/' . $this->tag . '.xml')) { - // Make sure it will not use the en-GB fallback. - $defaultLanguage = new JLanguage('en-GB'); - $defaultLanguage->load('', JPATH_INSTALLATION); - - $defaultLanguageNativeTitle = $defaultLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME'); - $installationLanguageNativeTitle = $installationLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME'); + $installationLanguage = new JLanguage($this->tag); + $installationLanguage->load('', JPATH_INSTALLATION); - if ($defaultLanguageNativeTitle != $installationLanguageNativeTitle) + if ($installationLanguage->hasKey('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME')) { - $contentLanguageNativeTitle = $installationLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME'); + // Make sure it will not use the en-GB fallback. + $defaultLanguage = new JLanguage('en-GB'); + $defaultLanguage->load('', JPATH_INSTALLATION); + + $defaultLanguageNativeTitle = $defaultLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME'); + $installationLanguageNativeTitle = $installationLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME'); + + if ($defaultLanguageNativeTitle != $installationLanguageNativeTitle) + { + $contentLanguageNativeTitle = $installationLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME'); + } } } } - + // Prepare language data for store. $languageData = array( 'lang_id' => 0, @@ -660,8 +670,7 @@ public function uninstall($eid) foreach ($users as $user) { - $registry = new Registry; - $registry->loadString($user->params); + $registry = new Registry($user->params); if ($registry->get($param_name) == $element) { diff --git a/libraries/cms/installer/adapter/module.php b/libraries/cms/installer/adapter/module.php index ecf8a08f9b9bb..3b428fdfe7d55 100644 --- a/libraries/cms/installer/adapter/module.php +++ b/libraries/cms/installer/adapter/module.php @@ -569,15 +569,11 @@ public function uninstall($id) { $manifestScriptFile = $this->parent->getPath('extension_root') . '/' . $manifestScript; - if (is_file($manifestScriptFile)) - { - // Load the file - include_once $manifestScriptFile; - } - // Set the class name $classname = $element . 'InstallerScript'; + JLoader::register($classname, $manifestScriptFile); + if (class_exists($classname)) { // Create a new instance diff --git a/libraries/cms/installer/adapter/package.php b/libraries/cms/installer/adapter/package.php index fbb83761fe0f1..54a3d917d8383 100644 --- a/libraries/cms/installer/adapter/package.php +++ b/libraries/cms/installer/adapter/package.php @@ -523,15 +523,11 @@ public function uninstall($id) { $manifestScriptFile = $this->parent->getPath('extension_root') . '/' . $manifestScript; - if (is_file($manifestScriptFile)) - { - // Load the file - include_once $manifestScriptFile; - } - // Set the class name $classname = $row->element . 'InstallerScript'; + JLoader::register($classname, $manifestScriptFile); + if (class_exists($classname)) { // Create a new instance diff --git a/libraries/cms/installer/adapter/plugin.php b/libraries/cms/installer/adapter/plugin.php index 1865100ade9da..1bca17deef825 100644 --- a/libraries/cms/installer/adapter/plugin.php +++ b/libraries/cms/installer/adapter/plugin.php @@ -515,17 +515,14 @@ public function uninstall($id) { $manifestScriptFile = $this->parent->getPath('source') . '/' . $manifestScript; - if (is_file($manifestScriptFile)) - { - // Load the file - include_once $manifestScriptFile; - } // If a dash is present in the folder, remove it $folderClass = str_replace('-', '', $row->folder); // Set the class name $classname = 'Plg' . $folderClass . $row->element . 'InstallerScript'; + JLoader::register($classname, $manifestScriptFile); + if (class_exists($classname)) { // Create a new instance diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php index 30f53423dc723..3d393be9e76a1 100644 --- a/libraries/cms/installer/installer.php +++ b/libraries/cms/installer/installer.php @@ -2289,7 +2289,7 @@ public function getAdapters($options = array(), array $custom = array()) if (!class_exists($class)) { // Try to load the adapter object - require_once $this->_basepath . '/' . $this->_adapterfolder . '/' . $fileName; + JLoader::register($class, $this->_basepath . '/' . $this->_adapterfolder . '/' . $fileName); if (!class_exists($class)) { @@ -2350,7 +2350,7 @@ public function loadAdapter($adapter, $options = array()) } // Try once more to find the class - require_once $path; + JLoader::register($class, $path); if (!class_exists($class)) { diff --git a/libraries/cms/layout/file.php b/libraries/cms/layout/file.php index 88969a764ff57..7a7c0ea656f67 100644 --- a/libraries/cms/layout/file.php +++ b/libraries/cms/layout/file.php @@ -640,7 +640,7 @@ public function setSuffixes(array $suffixes) /** * Render a layout with the same include paths & options * - * @param object $layoutId Object which properties are used inside the layout file to build displayed output + * @param string $layoutId The identifier for the sublayout to be searched in a subfolder with the name of the current layout * @param mixed $displayData Data to be rendered * * @return string The necessary HTML to display the layout diff --git a/libraries/cms/library/helper.php b/libraries/cms/library/helper.php index 65fb44582223f..ae389ce9b387d 100644 --- a/libraries/cms/library/helper.php +++ b/libraries/cms/library/helper.php @@ -175,9 +175,7 @@ protected static function _load($element) // Convert the params to an object. if (is_string(static::$libraries[$element]->params)) { - $temp = new Registry; - $temp->loadString(static::$libraries[$element]->params); - static::$libraries[$element]->params = $temp; + static::$libraries[$element]->params = new Registry(static::$libraries[$element]->params); } return true; diff --git a/libraries/cms/menu/menu.php b/libraries/cms/menu/menu.php index cdade25890ab4..f302b72f6769e 100644 --- a/libraries/cms/menu/menu.php +++ b/libraries/cms/menu/menu.php @@ -83,9 +83,7 @@ public function __construct($options = array()) // Decode the item params try { - $result = new Registry; - $result->loadString($item->params); - $item->params = $result; + $item->params = new Registry($item->params); } catch (RuntimeException $e) { @@ -129,10 +127,11 @@ public static function getInstance($client, $options = array()) { $path = $info->path . '/includes/menu.php'; - if (file_exists($path)) + JLoader::register($classname, $path); + + if (class_exists($classname)) { JLog::add('Non-autoloadable JMenu subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated'); - include_once $path; } } } diff --git a/libraries/cms/module/helper.php b/libraries/cms/module/helper.php index cae0e273bd223..7ba5884bff0dd 100644 --- a/libraries/cms/module/helper.php +++ b/libraries/cms/module/helper.php @@ -166,8 +166,7 @@ public static function renderModule($module, $attribs = array()) $app->scope = $module->module; // Get module parameters - $params = new Registry; - $params->loadString($module->params); + $params = new Registry($module->params); // Get the template $template = $app->getTemplate(); diff --git a/libraries/cms/pathway/pathway.php b/libraries/cms/pathway/pathway.php index 2379da7b5999b..d1497b4bbcb22 100644 --- a/libraries/cms/pathway/pathway.php +++ b/libraries/cms/pathway/pathway.php @@ -79,10 +79,11 @@ public static function getInstance($client, $options = array()) { $path = $info->path . '/includes/pathway.php'; - if (file_exists($path)) + JLoader::register($classname, $path); + + if (class_exists($classname)) { JLog::add('Non-autoloadable JPathway subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated'); - include_once $path; } } } diff --git a/libraries/cms/plugin/plugin.php b/libraries/cms/plugin/plugin.php index 16e6c83d62da2..ee8436ae33f55 100644 --- a/libraries/cms/plugin/plugin.php +++ b/libraries/cms/plugin/plugin.php @@ -71,8 +71,7 @@ public function __construct(&$subject, $config = array()) } else { - $this->params = new Registry; - $this->params->loadString($config['params']); + $this->params = new Registry($config['params']); } } diff --git a/libraries/cms/router/router.php b/libraries/cms/router/router.php index dadb29b07b1ce..c8b20f4801069 100644 --- a/libraries/cms/router/router.php +++ b/libraries/cms/router/router.php @@ -184,10 +184,11 @@ public static function getInstance($client, $options = array()) { $path = $info->path . '/includes/router.php'; - if (file_exists($path)) + JLoader::register($classname, $path); + + if (class_exists($classname)) { JLog::add('Non-autoloadable JRouter subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated'); - include_once $path; } } } diff --git a/libraries/cms/router/site.php b/libraries/cms/router/site.php index 07dd5d491806b..208c1fd4cb5d7 100644 --- a/libraries/cms/router/site.php +++ b/libraries/cms/router/site.php @@ -731,14 +731,8 @@ public function getComponentRouter($component) if (!class_exists($class)) { - // Use the component routing handler if it exists - $path = JPATH_SITE . '/components/' . $component . '/router.php'; - - // Use the custom routing handler if it exists - if (file_exists($path)) - { - require_once $path; - } + // Add the custom routing handler to the autoloader if it exists + JLoader::register($class, JPATH_SITE . '/components/' . $component . '/router.php'); } if (class_exists($class)) diff --git a/libraries/cms/table/corecontent.php b/libraries/cms/table/corecontent.php index 2fa07bc7ff3a5..42e3aed45d4ec 100644 --- a/libraries/cms/table/corecontent.php +++ b/libraries/cms/table/corecontent.php @@ -48,36 +48,31 @@ public function bind($array, $ignore = '') { if (isset($array['core_params']) && is_array($array['core_params'])) { - $registry = new Registry; - $registry->loadArray($array['core_params']); + $registry = new Registry($array['core_params']); $array['core_params'] = (string) $registry; } if (isset($array['core_metadata']) && is_array($array['core_metadata'])) { - $registry = new Registry; - $registry->loadArray($array['core_metadata']); + $registry = new Registry($array['core_metadata']); $array['core_metadata'] = (string) $registry; } if (isset($array['core_images']) && is_array($array['core_images'])) { - $registry = new Registry; - $registry->loadArray($array['core_images']); + $registry = new Registry($array['core_images']); $array['core_images'] = (string) $registry; } if (isset($array['core_urls']) && is_array($array['core_urls'])) { - $registry = new Registry; - $registry->loadArray($array['core_urls']); + $registry = new Registry($array['core_urls']); $array['core_urls'] = (string) $registry; } if (isset($array['core_body']) && is_array($array['core_body'])) { - $registry = new Registry; - $registry->loadArray($array['core_body']); + $registry = new Registry($array['core_body']); $array['core_body'] = (string) $registry; } diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php index 6613294dcd3e8..8f10f3d737d52 100644 --- a/libraries/cms/version/version.php +++ b/libraries/cms/version/version.php @@ -70,7 +70,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELDATE = '27-June-2016'; + const RELDATE = '18-October-2016'; /** * Release time. @@ -78,7 +78,7 @@ final class JVersion * @var string * @since 3.5 */ - const RELTIME = '08:13'; + const RELTIME = '16:37'; /** * Release timezone. diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php index 33fb7e2d4e204..61f55668973f0 100644 --- a/libraries/joomla/application/web.php +++ b/libraries/joomla/application/web.php @@ -1071,7 +1071,7 @@ public function afterSessionStart() if ($session->isNew()) { - $session->set('registry', new Registry('session')); + $session->set('registry', new Registry); $session->set('user', new JUser); } } diff --git a/libraries/joomla/base/adapter.php b/libraries/joomla/base/adapter.php index 5d6552c04f21f..eb6861f16fcbf 100644 --- a/libraries/joomla/base/adapter.php +++ b/libraries/joomla/base/adapter.php @@ -138,10 +138,10 @@ public function setAdapter($name, &$adapter = null, $options = array()) } // Try to load the adapter object - require_once $fullpath; - $class = $this->_classprefix . ucfirst($name); + JLoader::register($class, $fullpath); + if (!class_exists($class)) { return false; diff --git a/libraries/joomla/cache/controller.php b/libraries/joomla/cache/controller.php index 839eef17c55c9..7f6842e0327df 100644 --- a/libraries/joomla/cache/controller.php +++ b/libraries/joomla/cache/controller.php @@ -102,7 +102,7 @@ public static function getInstance($type = 'output', $options = array()) throw new RuntimeException('Unable to load Cache Controller: ' . $type, 500); } - include_once $path; + JLoader::register($class, $path); // The class should now be loaded if (!class_exists($class)) diff --git a/libraries/joomla/cache/storage.php b/libraries/joomla/cache/storage.php index d7cc91c12e78e..eed2ae10a0bed 100644 --- a/libraries/joomla/cache/storage.php +++ b/libraries/joomla/cache/storage.php @@ -158,7 +158,7 @@ public static function getInstance($handler = null, $options = array()) throw new JCacheExceptionUnsupported(sprintf('Unable to load Cache Storage: %s', $handler)); } - include_once $path; + JLoader::register($class, $path); // The class should now be loaded if (!class_exists($class)) diff --git a/libraries/joomla/date/date.php b/libraries/joomla/date/date.php index 2aa920ca1e9ba..028ea77bf47b3 100644 --- a/libraries/joomla/date/date.php +++ b/libraries/joomla/date/date.php @@ -28,7 +28,7 @@ * @property-read string $microsecond u - Microseconds with leading zeros. * @property-read string $month m - Numeric representation of a month, with leading zeros. * @property-read string $ordinal S - English ordinal suffix for the day of the month, 2 characters. - * @property-read string $week W - Numeric representation of the day of the week. + * @property-read string $week W - ISO-8601 week number of year, weeks starting on Monday. * @property-read string $year Y - A full numeric representation of a year, 4 digits. * * @since 11.1 diff --git a/libraries/joomla/document/document.php b/libraries/joomla/document/document.php index 3703d05fac356..501dc24019942 100644 --- a/libraries/joomla/document/document.php +++ b/libraries/joomla/document/document.php @@ -292,10 +292,11 @@ public static function getInstance($type = 'html', $attributes = array()) // @deprecated 4.0 - JDocument objects should be autoloaded instead $path = __DIR__ . '/' . $type . '/' . $type . '.php'; - if (file_exists($path)) + JLoader::register($class, $path); + + if (class_exists($class)) { JLog::add('Non-autoloadable JDocument subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated'); - require_once $path; } // Default to the raw format else @@ -486,6 +487,12 @@ public function addScript($url, $options = array(), $attribs = array()) } } + // Default value for type. + if (!isset($attribs['type']) && !isset($attribs['mime'])) + { + $attribs['type'] = 'text/javascript'; + } + $this->_scripts[$url] = isset($this->_scripts[$url]) ? array_replace($this->_scripts[$url], $attribs) : $attribs; $this->_scripts[$url]['options'] = isset($this->_scripts[$url]['options']) ? array_replace($this->_scripts[$url]['options'], $options) : $options; @@ -1118,8 +1125,9 @@ public function loadRenderer($type) throw new RuntimeException('Unable to load renderer class', 500); } + JLoader::register($class, $path); + JLog::add('Non-autoloadable JDocumentRenderer subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated'); - require_once $path; // If the class still doesn't exist after including the path, we've got issues if (!class_exists($class)) diff --git a/libraries/joomla/document/html.php b/libraries/joomla/document/html.php index 0a3103b3b6a3c..2653a0626f14c 100644 --- a/libraries/joomla/document/html.php +++ b/libraries/joomla/document/html.php @@ -97,6 +97,8 @@ class JDocumentHtml extends JDocument * * @var boolean * @since 12.1 + * + * @note 4.0 Will be replaced by $html5 and the default value will be true. */ private $_html5 = null; @@ -219,7 +221,7 @@ public function mergeHeadData($data) } $this->_links = (isset($data['links']) && !empty($data['links']) && is_array($data['links'])) - ? array_unique(array_merge($this->_links, $data['links'])) + ? array_unique(array_merge($this->_links, $data['links']), SORT_REGULAR) : $this->_links; $this->_styleSheets = (isset($data['styleSheets']) && !empty($data['styleSheets']) && is_array($data['styleSheets'])) ? array_merge($this->_styleSheets, $data['styleSheets']) diff --git a/libraries/joomla/form/helper.php b/libraries/joomla/form/helper.php index ef0402ebb5ddd..45c267e0b309a 100644 --- a/libraries/joomla/form/helper.php +++ b/libraries/joomla/form/helper.php @@ -206,12 +206,13 @@ protected static function loadClass($entity, $type) foreach ($paths as $path) { $file = JPath::find($path, $type); + if (!$file) { continue; } - require_once $file; + JLoader::register($class, $file); if (class_exists($class)) { diff --git a/libraries/joomla/form/rule/number.php b/libraries/joomla/form/rule/number.php index 59a563de12d49..a384d65430d0b 100644 --- a/libraries/joomla/form/rule/number.php +++ b/libraries/joomla/form/rule/number.php @@ -9,12 +9,12 @@ defined('JPATH_PLATFORM') or die; +use Joomla\Registry\Registry; + /** * Form Rule class for the Joomla Platform. * - * @package Joomla.Platform - * @subpackage Form - * @since 3.5 + * @since 3.5 */ class JFormRuleNumber extends JFormRule { @@ -26,14 +26,14 @@ class JFormRuleNumber extends JFormRule * @param string $group The field name group control value. This acts as as an array container for the field. * For example if the field has name="foo" and the group value is set to "bar" then the * full field name would end up being "bar[foo]". - * @param JRegistry $input An optional JRegistry object with the entire data set to validate against the entire form. + * @param Registry $input An optional Registry object with the entire data set to validate against the entire form. * @param JForm $form The form object for which the field is being tested. * * @return boolean True if the value is valid, false otherwise. * * @since 3.5 */ - public function test(SimpleXMLElement $element, $value, $group = null, JRegistry $input = null, JForm $form = null) + public function test(SimpleXMLElement $element, $value, $group = null, Registry $input = null, JForm $form = null) { $float_value = (float) $value; diff --git a/libraries/joomla/language/language.php b/libraries/joomla/language/language.php index ca5668cb41e04..948594a2ff6dc 100644 --- a/libraries/joomla/language/language.php +++ b/libraries/joomla/language/language.php @@ -233,10 +233,7 @@ public function __construct($lang = null, $debug = false) while (!class_exists($class) && $path) { - if (file_exists($path)) - { - require_once $path; - } + JLoader::register($class, $path); $path = next($paths); } diff --git a/libraries/joomla/session/handler/native.php b/libraries/joomla/session/handler/native.php index bc13c8ab327f9..c339a6f1ae5a4 100644 --- a/libraries/joomla/session/handler/native.php +++ b/libraries/joomla/session/handler/native.php @@ -187,7 +187,7 @@ public function save() $session = JFactory::getSession(); $data = $session->getData(); - // Before storing it, let's serialize and encode the JRegistry object + // Before storing it, let's serialize and encode the Registry object $_SESSION['joomla'] = base64_encode(serialize($data)); session_write_close(); diff --git a/libraries/joomla/session/storage.php b/libraries/joomla/session/storage.php index 00f98a0c2cf34..76c6a01dd9989 100644 --- a/libraries/joomla/session/storage.php +++ b/libraries/joomla/session/storage.php @@ -65,7 +65,7 @@ public static function getInstance($name = 'none', $options = array()) throw new JSessionExceptionUnsupported('Unable to load session storage class: ' . $name); } - require_once $path; + JLoader::register($class, $path); // The class should now be loaded if (!class_exists($class)) diff --git a/libraries/joomla/table/extension.php b/libraries/joomla/table/extension.php index f349ee42ca5bb..e901b3f2d0c83 100644 --- a/libraries/joomla/table/extension.php +++ b/libraries/joomla/table/extension.php @@ -68,15 +68,13 @@ public function bind($array, $ignore = '') { if (isset($array['params']) && is_array($array['params'])) { - $registry = new Registry; - $registry->loadArray($array['params']); + $registry = new Registry($array['params']); $array['params'] = (string) $registry; } if (isset($array['control']) && is_array($array['control'])) { - $registry = new Registry; - $registry->loadArray($array['control']); + $registry = new Registry($array['control']); $array['control'] = (string) $registry; } diff --git a/libraries/joomla/table/language.php b/libraries/joomla/table/language.php index 3ff2b2ed97db2..b654208df1aae 100644 --- a/libraries/joomla/table/language.php +++ b/libraries/joomla/table/language.php @@ -69,7 +69,7 @@ public function store($updateNulls = false) } // Verify that the image field is unique - if ($table->load(array('image' => $this->image)) && ($table->lang_id != $this->lang_id || $this->lang_id == 0)) + if ($this->image && $table->load(array('image' => $this->image)) && ($table->lang_id != $this->lang_id || $this->lang_id == 0)) { $this->setError(JText::_('JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_IMAGE')); diff --git a/libraries/joomla/table/table.php b/libraries/joomla/table/table.php index 89976df78fb06..2562bbb304f7d 100644 --- a/libraries/joomla/table/table.php +++ b/libraries/joomla/table/table.php @@ -286,7 +286,7 @@ public static function getInstance($type, $prefix = 'JTable', $config = array()) if ($tryThis = JPath::find($paths[$pathIndex++], strtolower($type) . '.php')) { // Import the class file. - include_once $tryThis; + JLoader::register($tableClass, $tryThis); } } diff --git a/libraries/joomla/table/update.php b/libraries/joomla/table/update.php index 05a42a7dfb8db..e7052b6ade14a 100644 --- a/libraries/joomla/table/update.php +++ b/libraries/joomla/table/update.php @@ -68,15 +68,13 @@ public function bind($array, $ignore = '') { if (isset($array['params']) && is_array($array['params'])) { - $registry = new Registry; - $registry->loadArray($array['params']); + $registry = new Registry($array['params']); $array['params'] = (string) $registry; } if (isset($array['control']) && is_array($array['control'])) { - $registry = new Registry; - $registry->loadArray($array['control']); + $registry = new Registry($array['control']); $array['control'] = (string) $registry; } diff --git a/libraries/joomla/table/user.php b/libraries/joomla/table/user.php index 2348c535d64ee..b4fd4c30a0897 100644 --- a/libraries/joomla/table/user.php +++ b/libraries/joomla/table/user.php @@ -127,8 +127,7 @@ public function bind($array, $ignore = '') { if (array_key_exists('params', $array) && is_array($array['params'])) { - $registry = new Registry; - $registry->loadArray($array['params']); + $registry = new Registry($array['params']); $array['params'] = (string) $registry; } diff --git a/libraries/joomla/updater/adapters/extension.php b/libraries/joomla/updater/adapters/extension.php index 6d4a0fe187222..2c5e1b65e132c 100644 --- a/libraries/joomla/updater/adapters/extension.php +++ b/libraries/joomla/updater/adapters/extension.php @@ -70,6 +70,11 @@ protected function _startElement($parser, $name, $attrs = array()) { $this->currentUpdate->php_minimum = ''; } + + if ($name == 'SUPPORTED_DATABASES') + { + $this->currentUpdate->supported_databases = $attrs; + } break; } } @@ -137,6 +142,56 @@ protected function _endElement($parser, $name) $phpMatch = false; } + $dbMatch = false; + + // Check if DB & version is supported via tag, assume supported if tag isn't present + if (isset($this->currentUpdate->supported_databases)) + { + $db = JFactory::getDbo(); + $dbType = strtoupper($db->getServerType()); + $dbVersion = $db->getVersion(); + $supportedDbs = $this->currentUpdate->supported_databases; + + // Do we have a entry for the database? + if (array_key_exists($dbType, $supportedDbs)) + { + $minumumVersion = $supportedDbs[$dbType]; + $dbMatch = version_compare($dbVersion, $minumumVersion, '>='); + + if (!$dbMatch) + { + // Notify the user of the potential update + $dbMsg = JText::sprintf( + 'JLIB_INSTALLER_AVAILABLE_UPDATE_DB_MINIMUM', + $this->currentUpdate->name, + $this->currentUpdate->version, + JText::_($db->name), + $dbVersion, + $minumumVersion + ); + + JFactory::getApplication()->enqueueMessage($dbMsg, 'warning'); + } + } + else + { + // Notify the user of the potential update + $dbMsg = JText::sprintf( + 'JLIB_INSTALLER_AVAILABLE_UPDATE_DB_TYPE', + $this->currentUpdate->name, + $this->currentUpdate->version, + JText::_($db->name) + ); + + JFactory::getApplication()->enqueueMessage($dbMsg, 'warning'); + } + } + else + { + // Set to true if the tag is not set + $dbMatch = true; + } + // Check minimum stability $stabilityMatch = true; @@ -153,13 +208,18 @@ protected function _endElement($parser, $name) unset($this->currentUpdate->php_minimum); } + if (isset($this->currentUpdate->supported_databases)) + { + unset($this->currentUpdate->supported_databases); + } + if (isset($this->currentUpdate->stability)) { unset($this->currentUpdate->stability); } // If the PHP version and minimum stability checks pass, consider this version as a possible update - if ($phpMatch && $stabilityMatch) + if ($phpMatch && $stabilityMatch && $dbMatch) { if (isset($this->latest)) { diff --git a/libraries/joomla/updater/update.php b/libraries/joomla/updater/update.php index e8053c60002ef..09568038b78e5 100644 --- a/libraries/joomla/updater/update.php +++ b/libraries/joomla/updater/update.php @@ -321,14 +321,35 @@ public function _endElement($parser, $name) && ((!isset($this->currentUpdate->targetplatform->min_dev_level)) || JVersion::DEV_LEVEL >= $this->currentUpdate->targetplatform->min_dev_level) && ((!isset($this->currentUpdate->targetplatform->max_dev_level)) || JVersion::DEV_LEVEL <= $this->currentUpdate->targetplatform->max_dev_level)) { + $phpMatch = false; + // Check if PHP version supported via tag, assume true if tag isn't present if (!isset($this->currentUpdate->php_minimum) || version_compare(PHP_VERSION, $this->currentUpdate->php_minimum->_data, '>=')) { $phpMatch = true; } + + $dbMatch = false; + + // Check if DB & version is supported via tag, assume supported if tag isn't present + if (isset($this->currentUpdate->supported_databases)) + { + $db = JFactory::getDbo(); + $dbType = strtolower($db->getServerType()); + $dbVersion = $db->getVersion(); + $supportedDbs = $this->currentUpdate->supported_databases; + + // Do we have a entry for the database? + if (isset($supportedDbs->$dbType)) + { + $minumumVersion = $supportedDbs->$dbType; + $dbMatch = version_compare($dbVersion, $minumumVersion, '>='); + } + } else { - $phpMatch = false; + // Set to true if the tag is not set + $dbMatch = true; } // Check minimum stability @@ -339,7 +360,7 @@ public function _endElement($parser, $name) $stabilityMatch = false; } - if ($phpMatch && $stabilityMatch) + if ($phpMatch && $stabilityMatch && $dbMatch) { if (isset($this->latest)) { diff --git a/libraries/joomla/user/helper.php b/libraries/joomla/user/helper.php index c03e924c8d101..4362849b2c147 100644 --- a/libraries/joomla/user/helper.php +++ b/libraries/joomla/user/helper.php @@ -612,7 +612,7 @@ public static function getSalt($encryption = 'md5-hex', $seed = '', $plaintext = for ($i = 0; $i < 8; $i++) { - $salt .= $APRMD5{rand(0, 63)}; + $salt .= $APRMD5{mt_rand(0, 63)}; } return $salt; diff --git a/libraries/joomla/user/user.php b/libraries/joomla/user/user.php index e06f48b6d9c33..ab9d26b46241e 100644 --- a/libraries/joomla/user/user.php +++ b/libraries/joomla/user/user.php @@ -798,8 +798,7 @@ public function save($updateOnly = false) if ($my->id == $table->id) { - $registry = new Registry; - $registry->loadString($table->params); + $registry = new Registry($table->params); $my->setParameters($registry); } diff --git a/libraries/joomla/utilities/utility.php b/libraries/joomla/utilities/utility.php index 69c8cb5334b01..cd8ca948158be 100644 --- a/libraries/joomla/utilities/utility.php +++ b/libraries/joomla/utilities/utility.php @@ -45,4 +45,37 @@ public static function parseAttributes($string) return $retarray; } + + /** + * Method to get the maximum allowed file size for the HTTP uploads based on the active PHP configuration + * + * @param mixed $custom A custom upper limit, if the PHP settings are all above this then this will be used + * + * @return int Size in number of bytes + * + * @since __DEPLOY_VERSION__ + */ + public static function getMaxUploadSize($custom = null) + { + if ($custom) + { + $custom = JHtml::_('number.bytes', $custom, ''); + + if ($custom > 0) + { + $sizes[] = $custom; + } + } + + /* + * Read INI settings which affects upload size limits + * and Convert each into number of bytes so that we can compare + */ + $sizes[] = JHtml::_('number.bytes', ini_get('memory_limit'), ''); + $sizes[] = JHtml::_('number.bytes', ini_get('post_max_size'), ''); + $sizes[] = JHtml::_('number.bytes', ini_get('upload_max_filesize'), ''); + + // The minimum of these is the limiting factor + return min($sizes); + } } diff --git a/libraries/legacy/application/application.php b/libraries/legacy/application/application.php index 1990c221b80df..402c48dcd66ea 100644 --- a/libraries/legacy/application/application.php +++ b/libraries/legacy/application/application.php @@ -1097,7 +1097,7 @@ public function afterSessionStart() if ($session->isNew()) { - $session->set('registry', new Registry('session')); + $session->set('registry', new Registry); $session->set('user', new JUser); } } diff --git a/libraries/legacy/categories/categories.php b/libraries/legacy/categories/categories.php index 19c7d944baf5f..380f73e3930ec 100644 --- a/libraries/legacy/categories/categories.php +++ b/libraries/legacy/categories/categories.php @@ -141,11 +141,9 @@ public static function getInstance($extension, $options = array()) { $path = JPATH_SITE . '/components/' . $component . '/helpers/category.php'; - if (is_file($path)) - { - include_once $path; - } - else + JLoader::register($classname, $path); + + if (!class_exists($classname)) { return false; } @@ -918,9 +916,7 @@ public function getParams() { if (!($this->params instanceof Registry)) { - $temp = new Registry; - $temp->loadString($this->params); - $this->params = $temp; + $this->params = new Registry($this->params); } return $this->params; @@ -937,9 +933,7 @@ public function getMetadata() { if (!($this->metadata instanceof Registry)) { - $temp = new Registry; - $temp->loadString($this->metadata); - $this->metadata = $temp; + $this->metadata = new Registry($this->metadata); } return $this->metadata; diff --git a/libraries/legacy/controller/legacy.php b/libraries/legacy/controller/legacy.php index 8270d66c7548b..9b77f4755d798 100644 --- a/libraries/legacy/controller/legacy.php +++ b/libraries/legacy/controller/legacy.php @@ -274,18 +274,19 @@ public static function getInstance($prefix, $config = array()) // Include the class if not present. if (!class_exists($class)) { - // If the controller file path exists, include it. - if (file_exists($path)) - { - require_once $path; - } - elseif (isset($backuppath) && file_exists($backuppath)) - { - require_once $backuppath; - } - else + JLoader::register($class, $path); + + if (!class_exists($class)) { - throw new InvalidArgumentException(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER', $type, $format)); + if (isset($backuppath) && file_exists($backuppath)) + { + JLoader::register($class, $backuppath); + } + + if (!class_exists($class)) + { + throw new InvalidArgumentException(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER', $type, $format)); + } } } @@ -585,7 +586,7 @@ protected function createView($name, $prefix = '', $type = '', $config = array() return null; } - require_once $path; + JLoader::register($viewClass, $path); if (!class_exists($viewClass)) { diff --git a/libraries/legacy/model/admin.php b/libraries/legacy/model/admin.php index d2e9c7b2400e5..6772842789c35 100644 --- a/libraries/legacy/model/admin.php +++ b/libraries/legacy/model/admin.php @@ -906,8 +906,7 @@ public function getItem($pk = null) if (property_exists($item, 'params')) { - $registry = new Registry; - $registry->loadString($item->params); + $registry = new Registry($item->params); $item->params = $registry->toArray(); } diff --git a/libraries/legacy/model/legacy.php b/libraries/legacy/model/legacy.php index bc93bf4dccb71..c415d20528ed1 100644 --- a/libraries/legacy/model/legacy.php +++ b/libraries/legacy/model/legacy.php @@ -191,7 +191,7 @@ public static function getInstance($type, $prefix = '', $config = array()) return false; } - require_once $path; + JLoader::register($modelClass, $path); if (!class_exists($modelClass)) { diff --git a/libraries/legacy/table/category.php b/libraries/legacy/table/category.php index e3f41fe8721f8..2f815bb90fba3 100644 --- a/libraries/legacy/table/category.php +++ b/libraries/legacy/table/category.php @@ -174,15 +174,13 @@ public function bind($array, $ignore = '') { if (isset($array['params']) && is_array($array['params'])) { - $registry = new Registry; - $registry->loadArray($array['params']); + $registry = new Registry($array['params']); $array['params'] = (string) $registry; } if (isset($array['metadata']) && is_array($array['metadata'])) { - $registry = new Registry; - $registry->loadArray($array['metadata']); + $registry = new Registry($array['metadata']); $array['metadata'] = (string) $registry; } diff --git a/libraries/legacy/table/content.php b/libraries/legacy/table/content.php index ce5f186c7fb9b..af03f4aa01947 100644 --- a/libraries/legacy/table/content.php +++ b/libraries/legacy/table/content.php @@ -142,15 +142,13 @@ public function bind($array, $ignore = '') if (isset($array['attribs']) && is_array($array['attribs'])) { - $registry = new Registry; - $registry->loadArray($array['attribs']); + $registry = new Registry($array['attribs']); $array['attribs'] = (string) $registry; } if (isset($array['metadata']) && is_array($array['metadata'])) { - $registry = new Registry; - $registry->loadArray($array['metadata']); + $registry = new Registry($array['metadata']); $array['metadata'] = (string) $registry; } diff --git a/libraries/legacy/table/menu.php b/libraries/legacy/table/menu.php index 554a6f794b447..122dc45f6457a 100644 --- a/libraries/legacy/table/menu.php +++ b/libraries/legacy/table/menu.php @@ -72,8 +72,7 @@ public function bind($array, $ignore = '') if (isset($array['params']) && is_array($array['params'])) { - $registry = new Registry; - $registry->loadArray($array['params']); + $registry = new Registry($array['params']); $array['params'] = (string) $registry; } @@ -204,7 +203,7 @@ public function store($updateNulls = false) } } - // The alias already exists. Enqueue a error message. + // The alias already exists. Enqueue an error message. if ($error) { $menuTypeTable = JTable::getInstance('MenuType', 'JTable', array('dbo' => $this->getDbo())); diff --git a/libraries/legacy/table/module.php b/libraries/legacy/table/module.php index 13a1d3bb102df..389792f5207e7 100644 --- a/libraries/legacy/table/module.php +++ b/libraries/legacy/table/module.php @@ -148,8 +148,7 @@ public function bind($array, $ignore = '') { if (isset($array['params']) && is_array($array['params'])) { - $registry = new Registry; - $registry->loadArray($array['params']); + $registry = new Registry($array['params']); $array['params'] = (string) $registry; } diff --git a/libraries/vendor/composer/ClassLoader.php b/libraries/vendor/composer/ClassLoader.php index ff6ecfb822f89..ac67d302a1866 100644 --- a/libraries/vendor/composer/ClassLoader.php +++ b/libraries/vendor/composer/ClassLoader.php @@ -53,8 +53,8 @@ class ClassLoader private $useIncludePath = false; private $classMap = array(); - private $classMapAuthoritative = false; + private $missingClasses = array(); public function getPrefixes() { @@ -322,20 +322,20 @@ public function findFile($class) if (isset($this->classMap[$class])) { return $this->classMap[$class]; } - if ($this->classMapAuthoritative) { + if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) { return false; } $file = $this->findFileWithExtension($class, '.php'); // Search for Hack files if we are running on HHVM - if ($file === null && defined('HHVM_VERSION')) { + if (false === $file && defined('HHVM_VERSION')) { $file = $this->findFileWithExtension($class, '.hh'); } - if ($file === null) { + if (false === $file) { // Remember that this class does not exist. - return $this->classMap[$class] = false; + $this->missingClasses[$class] = true; } return $file; @@ -399,6 +399,8 @@ private function findFileWithExtension($class, $ext) if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { return $file; } + + return false; } } diff --git a/media/editors/codemirror/addon/comment/comment.js b/media/editors/codemirror/addon/comment/comment.js index 2f2f071df974d..d71cf43603776 100644 --- a/media/editors/codemirror/addon/comment/comment.js +++ b/media/editors/codemirror/addon/comment/comment.js @@ -103,6 +103,7 @@ self.lineComment(from, to, options); return; } + if (/\bcomment\b/.test(self.getTokenTypeAt(Pos(from.line, 0)))) return var end = Math.min(to.line, self.lastLine()); if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end; @@ -162,13 +163,15 @@ var endString = options.blockCommentEnd || mode.blockCommentEnd; if (!startString || !endString) return false; var lead = options.blockCommentLead || mode.blockCommentLead; - var startLine = self.getLine(start), endLine = end == start ? startLine : self.getLine(end); - var open = startLine.indexOf(startString), close = endLine.lastIndexOf(endString); + var startLine = self.getLine(start), open = startLine.indexOf(startString) + if (open == -1) return false + var endLine = end == start ? startLine : self.getLine(end) + var close = endLine.indexOf(endString, end == start ? open + startString.length : 0); if (close == -1 && start != end) { endLine = self.getLine(--end); - close = endLine.lastIndexOf(endString); + close = endLine.indexOf(endString); } - if (open == -1 || close == -1 || + if (close == -1 || !/comment/.test(self.getTokenTypeAt(Pos(start, open + 1))) || !/comment/.test(self.getTokenTypeAt(Pos(end, close + 1)))) return false; diff --git a/media/editors/codemirror/addon/comment/comment.min.js b/media/editors/codemirror/addon/comment/comment.min.js index 8f1bffcddf91a..5e906b35ebd37 100644 --- a/media/editors/codemirror/addon/comment/comment.min.js +++ b/media/editors/codemirror/addon/comment/comment.min.js @@ -1 +1 @@ -!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)}(function(a){"use strict";function b(a){var b=a.search(e);return-1==b?0:b}function c(a,b,c){return/\bstring\b/.test(a.getTokenTypeAt(f(b.line,0)))&&!/^[\'\"`]/.test(c)}var d={},e=/[^\s\u00a0]/,f=a.Pos;a.commands.toggleComment=function(a){a.toggleComment()},a.defineExtension("toggleComment",function(a){a||(a=d);for(var b=this,c=1/0,e=this.listSelections(),g=null,h=e.length-1;h>=0;h--){var i=e[h].from(),j=e[h].to();i.line>=c||(j.line>=c&&(j=f(c,0)),c=i.line,null==g?b.uncomment(i,j,a)?g="un":(b.lineComment(i,j,a),g="line"):"un"==g?b.uncomment(i,j,a):b.lineComment(i,j,a))}}),a.defineExtension("lineComment",function(a,g,h){h||(h=d);var i=this,j=i.getModeAt(a),k=i.getLine(a.line);if(null!=k&&!c(i,a,k)){var l=h.lineComment||j.lineComment;if(!l)return void((h.blockCommentStart||j.blockCommentStart)&&(h.fullLines=!0,i.blockComment(a,g,h)));var m=Math.min(0!=g.ch||g.line==a.line?g.line+1:g.line,i.lastLine()+1),n=null==h.padding?" ":h.padding,o=h.commentBlankLines||a.line==g.line;i.operation(function(){if(h.indent){for(var c=null,d=a.line;m>d;++d){var g=i.getLine(d),j=g.slice(0,b(g));(null==c||c.length>j.length)&&(c=j)}for(var d=a.line;m>d;++d){var g=i.getLine(d),k=c.length;(o||e.test(g))&&(g.slice(0,k)!=c&&(k=b(g)),i.replaceRange(c+l+n,f(d,0),f(d,k)))}}else for(var d=a.line;m>d;++d)(o||e.test(i.getLine(d)))&&i.replaceRange(l+n,f(d,0))})}}),a.defineExtension("blockComment",function(a,b,c){c||(c=d);var g=this,h=g.getModeAt(a),i=c.blockCommentStart||h.blockCommentStart,j=c.blockCommentEnd||h.blockCommentEnd;if(!i||!j)return void((c.lineComment||h.lineComment)&&0!=c.fullLines&&g.lineComment(a,b,c));var k=Math.min(b.line,g.lastLine());k!=a.line&&0==b.ch&&e.test(g.getLine(k))&&--k;var l=null==c.padding?" ":c.padding;a.line>k||g.operation(function(){if(0!=c.fullLines){var d=e.test(g.getLine(k));g.replaceRange(l+j,f(k)),g.replaceRange(i+l,f(a.line,0));var m=c.blockCommentLead||h.blockCommentLead;if(null!=m)for(var n=a.line+1;k>=n;++n)(n!=k||d)&&g.replaceRange(m+l,f(n,0))}else g.replaceRange(j,b),g.replaceRange(i,a)})}),a.defineExtension("uncomment",function(a,b,c){c||(c=d);var g,h=this,i=h.getModeAt(a),j=Math.min(0!=b.ch||b.line==a.line?b.line:b.line-1,h.lastLine()),k=Math.min(a.line,j),l=c.lineComment||i.lineComment,m=[],n=null==c.padding?" ":c.padding;a:if(l){for(var o=k;j>=o;++o){var p=h.getLine(o),q=p.indexOf(l);if(q>-1&&!/comment/.test(h.getTokenTypeAt(f(o,q+1)))&&(q=-1),-1==q&&e.test(p))break a;if(q>-1&&e.test(p.slice(0,q)))break a;m.push(p)}if(h.operation(function(){for(var a=k;j>=a;++a){var b=m[a-k],c=b.indexOf(l),d=c+l.length;0>c||(b.slice(d,d+n.length)==n&&(d+=n.length),g=!0,h.replaceRange("",f(a,c),f(a,d)))}}),g)return!0}var r=c.blockCommentStart||i.blockCommentStart,s=c.blockCommentEnd||i.blockCommentEnd;if(!r||!s)return!1;var t=c.blockCommentLead||i.blockCommentLead,u=h.getLine(k),v=j==k?u:h.getLine(j),w=u.indexOf(r),x=v.lastIndexOf(s);if(-1==x&&k!=j&&(v=h.getLine(--j),x=v.lastIndexOf(s)),-1==w||-1==x||!/comment/.test(h.getTokenTypeAt(f(k,w+1)))||!/comment/.test(h.getTokenTypeAt(f(j,x+1))))return!1;var y=u.lastIndexOf(r,a.ch),z=-1==y?-1:u.slice(0,a.ch).indexOf(s,y+r.length);if(-1!=y&&-1!=z&&z+s.length!=a.ch)return!1;z=v.indexOf(s,b.ch);var A=v.slice(b.ch).lastIndexOf(r,z-b.ch);return y=-1==z||-1==A?-1:b.ch+A,-1!=z&&-1!=y&&y!=b.ch?!1:(h.operation(function(){h.replaceRange("",f(j,x-(n&&v.slice(x-n.length,x)==n?n.length:0)),f(j,x+s.length));var a=w+r.length;if(n&&u.slice(a,a+n.length)==n&&(a+=n.length),h.replaceRange("",f(k,w),f(k,a)),t)for(var b=k+1;j>=b;++b){var c=h.getLine(b),d=c.indexOf(t);if(-1!=d&&!e.test(c.slice(0,d))){var g=d+t.length;n&&c.slice(g,g+n.length)==n&&(g+=n.length),h.replaceRange("",f(b,d),f(b,g))}}}),!0)})}); \ No newline at end of file +!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=a.search(e);return b==-1?0:b}function c(a,b,c){return/\bstring\b/.test(a.getTokenTypeAt(f(b.line,0)))&&!/^[\'\"`]/.test(c)}var d={},e=/[^\s\u00a0]/,f=a.Pos;a.commands.toggleComment=function(a){a.toggleComment()},a.defineExtension("toggleComment",(function(a){a||(a=d);for(var b=this,c=1/0,e=this.listSelections(),g=null,h=e.length-1;h>=0;h--){var i=e[h].from(),j=e[h].to();i.line>=c||(j.line>=c&&(j=f(c,0)),c=i.line,null==g?b.uncomment(i,j,a)?g="un":(b.lineComment(i,j,a),g="line"):"un"==g?b.uncomment(i,j,a):b.lineComment(i,j,a))}})),a.defineExtension("lineComment",(function(a,g,h){h||(h=d);var i=this,j=i.getModeAt(a),k=i.getLine(a.line);if(null!=k&&!c(i,a,k)){var l=h.lineComment||j.lineComment;if(!l)return void((h.blockCommentStart||j.blockCommentStart)&&(h.fullLines=!0,i.blockComment(a,g,h)));var m=Math.min(0!=g.ch||g.line==a.line?g.line+1:g.line,i.lastLine()+1),n=null==h.padding?" ":h.padding,o=h.commentBlankLines||a.line==g.line;i.operation((function(){if(h.indent){for(var c=null,d=a.line;d ",type:"keyToKey",toKeys:"l"},{keys:" ",type:"keyToKey",toKeys:"k"},{keys:" ",type:"keyToKey",toKeys:"j"},{keys:" ",type:"keyToKey",toKeys:"l"},{keys:" ",type:"keyToKey",toKeys:"h",context:"normal"},{keys:" ",type:"keyToKey",toKeys:"W"},{keys:" ",type:"keyToKey",toKeys:"B",context:"normal"},{keys:" ",type:"keyToKey",toKeys:"w"},{keys:" ",type:"keyToKey",toKeys:"b",context:"normal"},{keys:" ",type:"keyToKey",toKeys:"j"},{keys:" ",type:"keyToKey",toKeys:"k"},{keys:" "},{keys:" ",type:"keyToKey",toKeys:" "},{keys:" ",context:"insert"},{keys:" ",type:"keyToKey",toKeys:" ",context:"insert"},{keys:"s",type:"keyToKey",toKeys:"cl",context:"normal"},{keys:"s",type:"keyToKey",toKeys:"c",context:"visual"},{keys:"S",type:"keyToKey",toKeys:"cc",context:"normal"},{keys:"S",type:"keyToKey",toKeys:"VdO",context:"visual"},{keys:" ",type:"keyToKey",toKeys:"0"},{keys:" ",type:"keyToKey",toKeys:"$"},{keys:" ",type:"keyToKey",toKeys:" "},{keys:" ",type:"keyToKey",toKeys:" "},{keys:" ",type:"keyToKey",toKeys:"j^",context:"normal"},{keys:"",type:"action",action:"toggleOverwrite",context:"insert"},{keys:"H",type:"motion",motion:"moveToTopLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"M",type:"motion",motion:"moveToMiddleLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"L",type:"motion",motion:"moveToBottomLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"h",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!1}},{keys:"l",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!0}},{keys:"j",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,linewise:!0}},{keys:"k",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,linewise:!0}},{keys:"gj",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!0}},{keys:"gk",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!1}},{keys:"w",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1}},{keys:"W",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1,bigWord:!0}},{keys:"e",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,inclusive:!0}},{keys:"E",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"b",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1}},{keys:"B",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1,bigWord:!0}},{keys:"ge",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,inclusive:!0}},{keys:"gE",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"{",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!1,toJumplist:!0}},{keys:"}",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!0,toJumplist:!0}},{keys:" ",type:"motion",motion:"moveByPage",motionArgs:{forward:!0}},{keys:" ",type:"motion",motion:"moveByPage",motionArgs:{forward:!1}},{keys:" ",type:"motion",motion:"moveByScroll",motionArgs:{forward:!0,explicitRepeat:!0}},{keys:" ",type:"motion",motion:"moveByScroll",motionArgs:{forward:!1,explicitRepeat:!0}},{keys:"gg",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"G",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!0,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"0",type:"motion",motion:"moveToStartOfLine"},{keys:"^",type:"motion",motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"+",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0}},{keys:"-",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,toFirstChar:!0}},{keys:"_",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0,repeatOffset:-1}},{keys:"$",type:"motion",motion:"moveToEol",motionArgs:{inclusive:!0}},{keys:"%",type:"motion",motion:"moveToMatchedSymbol",motionArgs:{inclusive:!0,toJumplist:!0}},{keys:"f ",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"F ",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!1}},{keys:"t ",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"T ",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!1}},{keys:";",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!0}},{keys:",",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!1}},{keys:"' ",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0,linewise:!0}},{keys:"` ",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0}},{keys:"]`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0}},{keys:"[`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1}},{keys:"]'",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0,linewise:!0}},{keys:"['",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1,linewise:!0}},{keys:"]p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0,matchIndent:!0}},{keys:"[p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0,matchIndent:!0}},{keys:"] ",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!0,toJumplist:!0}},{keys:"[ ",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!1,toJumplist:!0}},{keys:"|",type:"motion",motion:"moveToColumn"},{keys:"o",type:"motion",motion:"moveToOtherHighlightedEnd",context:"visual"},{keys:"O",type:"motion",motion:"moveToOtherHighlightedEnd",motionArgs:{sameLine:!0},context:"visual"},{keys:"d",type:"operator",operator:"delete"},{keys:"y",type:"operator",operator:"yank"},{keys:"c",type:"operator",operator:"change"},{keys:">",type:"operator",operator:"indent",operatorArgs:{indentRight:!0}},{keys:"<",type:"operator",operator:"indent",operatorArgs:{indentRight:!1}},{keys:"g~",type:"operator",operator:"changeCase"},{keys:"gu",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},isEdit:!0},{keys:"gU",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},isEdit:!0},{keys:"n",type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:!0}},{keys:"N",type:"motion",motion:"findNext",motionArgs:{forward:!1,toJumplist:!0}},{keys:"x",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!0},operatorMotionArgs:{visualLine:!1}},{keys:"X",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!1},operatorMotionArgs:{visualLine:!0}},{keys:"D",type:"operatorMotion",operator:"delete",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"D",type:"operator",operator:"delete",operatorArgs:{linewise:!0},context:"visual"},{keys:"Y",type:"operatorMotion",operator:"yank",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"Y",type:"operator",operator:"yank",operatorArgs:{linewise:!0},context:"visual"},{keys:"C",type:"operatorMotion",operator:"change",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"C",type:"operator",operator:"change",operatorArgs:{linewise:!0},context:"visual"},{keys:"~",type:"operatorMotion",operator:"changeCase",motion:"moveByCharacters",motionArgs:{forward:!0},operatorArgs:{shouldMoveCursor:!0},context:"normal"},{keys:"~",type:"operator",operator:"changeCase",context:"visual"},{keys:" ",type:"operatorMotion",operator:"delete",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1},context:"insert"},{keys:" ",type:"action",action:"jumpListWalk",actionArgs:{forward:!0}},{keys:" ",type:"action",action:"jumpListWalk",actionArgs:{forward:!1}},{keys:" ",type:"action",action:"scroll",actionArgs:{forward:!0,linewise:!0}},{keys:" ",type:"action",action:"scroll",actionArgs:{forward:!1,linewise:!0}},{keys:"a",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"charAfter"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"eol"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"endOfSelectedArea"},context:"visual"},{keys:"i",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"inplace"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"firstNonBlank"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"startOfSelectedArea"},context:"visual"},{keys:"o",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!0},context:"normal"},{keys:"O",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!1},context:"normal"},{keys:"v",type:"action",action:"toggleVisualMode"},{keys:"V",type:"action",action:"toggleVisualMode",actionArgs:{linewise:!0}},{keys:" ",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:" ",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"gv",type:"action",action:"reselectLastSelection"},{keys:"J",type:"action",action:"joinLines",isEdit:!0},{keys:"p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0}},{keys:"P",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0}},{keys:"r ",type:"action",action:"replace",isEdit:!0},{keys:"@ ",type:"action",action:"replayMacro"},{keys:"q ",type:"action",action:"enterMacroRecordMode"},{keys:"R",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{replace:!0}},{keys:"u",type:"action",action:"undo",context:"normal"},{keys:"u",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},context:"visual",isEdit:!0},{keys:"U",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},context:"visual",isEdit:!0},{keys:" ",type:"action",action:"redo"},{keys:"m ",type:"action",action:"setMark"},{keys:'" ',type:"action",action:"setRegister"},{keys:"zz",type:"action",action:"scrollToCursor",actionArgs:{position:"center"}},{keys:"z.",type:"action",action:"scrollToCursor",actionArgs:{position:"center"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"zt",type:"action",action:"scrollToCursor",actionArgs:{position:"top"}},{keys:"z ",type:"action",action:"scrollToCursor",actionArgs:{position:"top"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"z-",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"}},{keys:"zb",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:".",type:"action",action:"repeatLastEdit"},{keys:" ",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!0,backtrack:!1}},{keys:" ",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!1,backtrack:!1}},{keys:"a ",type:"motion",motion:"textObjectManipulation"},{keys:"i