Merge remote-tracking branch 'origin/prod/pluto' into dev/mike
This commit is contained in:
commit
dad32bd044
3 changed files with 2 additions and 2 deletions
|
@ -71,7 +71,6 @@ $action = isset($_GET["action"]) ? $_GET["action"] : "";
|
|||
if ($action == "insert" || $action == "update") {
|
||||
/* validate the data. */
|
||||
$description = filter_var(trim($_GET["description"], FILTER_SANITIZE_STRING));;
|
||||
$description = htmlspecialchars($description, ENT_QUOTES, 'UTF-8');
|
||||
try {
|
||||
$eventdate = new DateTime($_GET["eventdate"]);
|
||||
}
|
||||
|
|
|
@ -78,7 +78,7 @@ function getGlobalOptions() {
|
|||
"email_xmailer" => "PHP/" . phpversion(),
|
||||
|
||||
/* Application name. */
|
||||
"app_name" => "Test Gift Registry",
|
||||
"app_name" => "Gift Registry",
|
||||
|
||||
/* Whether or not to show brief blurbs in certain spots which describe how
|
||||
features work.
|
||||
|
|
|
@ -156,5 +156,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|||
</div> <!-- container -->
|
||||
</main>
|
||||
{include file='footer.tpl'}
|
||||
{if isset($action) && $action == "edit"} <script> $(document).ready(function() { $('html, body').animate({ scrollTop: $(document).height() }, 'fast'); }); </script> {/if}
|
||||
</body>
|
||||
</html>
|
||||
|
|
Loading…
Add table
Reference in a new issue