diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2009-11-15 19:44:47 -0800 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2009-11-15 19:44:47 -0800 |
| commit | 0733dc37fda27a5ba35f9020edf3c66aa41a95a0 (patch) | |
| tree | 6877946232f1b01b1c8709054c689f6658cef34f /themes/default/views/sidebar.html.php | |
| parent | 218493c50be9362d4abed6900a816308fee5d978 (diff) | |
| parent | 9379308f91a476f790fb8d444536719535c584e4 (diff) | |
Merge commit 'upstream/master'
Conflicts:
modules/gallery/tests/xss_data.txt
Diffstat (limited to 'themes/default/views/sidebar.html.php')
| -rw-r--r-- | themes/default/views/sidebar.html.php | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php deleted file mode 100644 index 04379eb6..00000000 --- a/themes/default/views/sidebar.html.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php defined("SYSPATH") or die("No direct script access.") ?> -<?= $theme->sidebar_top() ?> -<div class="gToolbar"> - <div id="gViewMenu" class="gButtonSet"> - <? if ($page_type == "album"):?> - <?= $theme->album_menu() ?> - <? elseif ($page_type == "photo") : ?> - <?= $theme->photo_menu() ?> - <? elseif ($page_type == "movie") : ?> - <?= $theme->movie_menu() ?> - <? elseif ($page_type == "tag") : ?> - <?= $theme->tag_menu() ?> - <? endif ?> - </div> -</div> - -<?= $theme->sidebar_blocks() ?> -<?= $theme->sidebar_bottom() ?> |