diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2012-11-29 17:41:07 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2012-11-29 17:41:07 +0000 |
| commit | fc7750c742d30c6ebd42a12c9d468f54e90d470d (patch) | |
| tree | e971591cf8497246a05db3d9793e8fb610610a56 /themes | |
| parent | a12ede0a39515b7b97aa8a3415f60d1c9752e3e6 (diff) | |
| parent | f457cd283cdfd9011d76ae96872e1f08bb219baf (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 1 | ||||
| -rw-r--r-- | themes/wind/views/page.html.php | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index 0300f7af..9a149149 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -1,5 +1,4 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<?php header("X-Frame-Options: SAMEORIGIN"); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" <?= $theme->html_attributes() ?> xml:lang="en" lang="en"> diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index c3e212c5..23021e4d 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -1,5 +1,4 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<?php header("X-Frame-Options: SAMEORIGIN"); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" <?= $theme->html_attributes() ?> xml:lang="en" lang="en"> @@ -131,7 +130,7 @@ </div> </div> <div id="g-sidebar" class="yui-b"> - <? if ($theme->page_subtype != "login"): ?> + <? if (!in_array($theme->page_subtype, array("login", "error"))): ?> <?= new View("sidebar.html") ?> <? endif ?> </div> |