Skip to content

Fix for issue #13531 #13535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 15, 2017
Merged

Fix for issue #13531 #13535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
882a6b8
Fix for issue #13531
frankmayer Jan 9, 2017
0c0877e
Removed $key, as it was an unused leftover
frankmayer Jan 9, 2017
fe73679
CS Fix
frankmayer Jan 9, 2017
59ddebd
Whitespace Fix
frankmayer Jan 10, 2017
cef190c
Merge branch 'staging' into fix-for-issue-13531
frankmayer Jan 10, 2017
6b79efa
Whitespace Fix
frankmayer Jan 10, 2017
62e6fc1
Whitespace Fix#2
frankmayer Jan 10, 2017
18aa146
Merge branch 'staging' of https://github.com/joomla/joomla-cms into f…
frankmayer Jan 11, 2017
f1f7c7f
Merge branch 'staging' into fix-for-issue-13531
frankmayer Jan 14, 2017
086ee73
Conflict resolution (hopefully, Don't have a complete dev-environment…
frankmayer Jan 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 44 additions & 21 deletions administrator/components/com_content/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@
name="spacer3"
type="spacer"
hr="true"
showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
/>
<field
name="targeta"
Expand Down Expand Up @@ -472,6 +473,7 @@
name="spacer4"
type="spacer"
hr="true"
showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
/>

<field
Expand Down Expand Up @@ -730,9 +732,11 @@
showon="num_columns!:,0,1"
>
<option
value="0">JGLOBAL_DOWN</option>
value="0">JGLOBAL_DOWN
</option>
<option
value="1">JGLOBAL_ACROSS</option>
value="1">JGLOBAL_ACROSS
</option>
</field>

<field name="spacer1"
Expand Down Expand Up @@ -861,13 +865,17 @@
label="JGLOBAL_CATEGORY_ORDER_LABEL"
description="JGLOBAL_CATEGORY_ORDER_DESC">
<option
value="none">JGLOBAL_NO_ORDER</option>
value="none">JGLOBAL_NO_ORDER
</option>
<option
value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
value="alpha">JGLOBAL_TITLE_ALPHABETICAL
</option>
<option
value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL
</option>
<option
value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
value="order">JGLOBAL_CATEGORY_MANAGER_ORDER
</option>
</field>

<field name="orderby_sec"
Expand All @@ -876,31 +884,44 @@
label="JGLOBAL_ARTICLE_ORDER_LABEL"
description="JGLOBAL_ARTICLE_ORDER_DESC">
<option
value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
value="rdate">JGLOBAL_MOST_RECENT_FIRST
</option>
<option
value="date">JGLOBAL_OLDEST_FIRST</option>
value="date">JGLOBAL_OLDEST_FIRST
</option>
<option
value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
value="alpha">JGLOBAL_TITLE_ALPHABETICAL
</option>
<option
value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL
</option>
<option
value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
value="author">JGLOBAL_AUTHOR_ALPHABETICAL
</option>
<option
value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL
</option>
<option
value="hits">JGLOBAL_MOST_HITS</option>
value="hits">JGLOBAL_MOST_HITS
</option>
<option
value="rhits">JGLOBAL_LEAST_HITS</option>
value="rhits">JGLOBAL_LEAST_HITS
</option>
<option
value="order">JGLOBAL_ARTICLE_MANAGER_ORDER</option>
value="order">JGLOBAL_ARTICLE_MANAGER_ORDER
</option>
<option
value="vote" requires="vote">JGLOBAL_VOTES_DESC</option>
value="vote" requires="vote">JGLOBAL_VOTES_DESC
</option>
<option
value="rvote" requires="vote">JGLOBAL_VOTES_ASC</option>
value="rvote" requires="vote">JGLOBAL_VOTES_ASC
</option>
<option
value="rank" requires="vote"> JGLOBAL_RATINGS_DESC</option>
value="rank" requires="vote">JGLOBAL_RATINGS_DESC
</option>
<option
value="rrank" requires="vote">JGLOBAL_RATINGS_ASC</option>
value="rrank" requires="vote">JGLOBAL_RATINGS_ASC
</option>
</field>

<field name="order_date" type="list"
Expand Down Expand Up @@ -972,9 +993,11 @@
showon="show_feed_link:1"
>
<option
value="0">JGLOBAL_INTRO_TEXT</option>
value="0">JGLOBAL_INTRO_TEXT
</option>
<option
value="1">JGLOBAL_FULL_TEXT</option>
value="1">JGLOBAL_FULL_TEXT
</option>
</field>

<field
Expand Down
20 changes: 16 additions & 4 deletions libraries/joomla/form/helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,27 +336,39 @@ public static function parseShowOnConditions($showOn, $formControl = null, $grou
return array();
}

$showOnData = array();
$showOnParts = preg_split('#\[AND\]|\[OR\]#', $showOn);

$formPath = $formControl ?: '';

if ($formPath && $group)
{
$formPath .= '[' . $group . ']';
}

$showOnData = array();
$showOnParts = preg_split('#(\[AND\]|\[OR\])#', $showOn, -1, PREG_SPLIT_DELIM_CAPTURE);
$op = '';

foreach ($showOnParts as $showOnPart)
{
if (($showOnPart === '[AND]') || $showOnPart === '[OR]')
{
$op = trim($showOnPart, '[]');
continue;
}

$compareEqual = strpos($showOnPart, '!:') === false;
$showOnPartBlocks = explode(($compareEqual ? ':' : '!:'), $showOnPart, 2);

$showOnData[] = array(
'field' => $formPath ? $formPath . '[' . $showOnPartBlocks[0] . ']' : $showOnPartBlocks[0],
'values' => explode(',', $showOnPartBlocks[1]),
'sign' => $compareEqual === true ? '=' : '!=',
'op' => preg_match('#^\[(AND|OR)\]#', $showOnPart, $matches) ? $matches[1] : '',
'op' => $op,
);

if ($op !== '')
{
$op = '';
}
}

return $showOnData;
Expand Down