Skip to content
Snippets Groups Projects
Commit 5694f8b1 authored by Demian Katz's avatar Demian Katz
Browse files

Merge branch 'release-4.1'

# Conflicts:
#	themes/bootstrap3/templates/devtools/deminify.phtml
parents a60e5283 eb070516
No related merge requests found
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<h2>Deminifier</h2> <h2>Deminifier</h2>
<? if (!$min): ?> <? if (empty($min)): ?>
<form method='POST'> <form method='POST'>
Minified text: Minified text:
<textarea name="min"></textarea> <textarea name="min"></textarea>
...@@ -15,23 +15,23 @@ ...@@ -15,23 +15,23 @@
<pre><? print_r($min) ?></pre> <pre><? print_r($min) ?></pre>
<? endif; ?> <? endif; ?>
<? if ($results): ?> <? if (isset($results)): ?>
<h3>Results Object</h3> <h3>Results Object</h3>
<p>Class: <?=get_class($results)?></p> <p>Class: <?=get_class($results)?></p>
<? endif; ?> <? endif; ?>
<? if ($query): ?> <? if (isset($query)): ?>
<h3>Query Object</h3> <h3>Query Object</h3>
<pre><? print_r($query) ?></pre> <pre><? print_r($query) ?></pre>
<? endif; ?> <? endif; ?>
<? if ($backendParams || $queryParams): ?> <? if (isset($backendParams) || isset($queryParams)): ?>
<h3>Backend Parameters</h3> <h3>Backend Parameters</h3>
<? if ($queryParams): ?> <? if (isset($queryParams)): ?>
<h4>Query Parameters</h4> <h4>Query Parameters</h4>
<pre><? print_r($queryParams) ?></pre> <pre><? print_r($queryParams) ?></pre>
<? endif; ?> <? endif; ?>
<? if ($backendParams): ?> <? if (isset($backendParams)): ?>
<h4>Non-query Parameters</h4> <h4>Non-query Parameters</h4>
<pre><? print_r($backendParams) ?></pre> <pre><? print_r($backendParams) ?></pre>
<? endif; ?> <? endif; ?>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment