Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of git@github.com:gallery/gallery3
  • Loading branch information
Tim Almdal committed Nov 21, 2009
2 parents 48e5af8 + 4c5e200 commit 7599894
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
10 changes: 6 additions & 4 deletions modules/gallery/controllers/admin_themes.php
Expand Up @@ -30,11 +30,13 @@ public function index() {
private function _get_themes() {
$themes = array();
foreach (scandir(THEMEPATH) as $theme_name) {
if ($theme_name[0] == ".") {
continue;
}
if (file_exists(THEMEPATH . "$theme_name/theme.info")) {
if ($theme_name[0] == ".") {
continue;
}

$themes[$theme_name] = theme::get_info($theme_name);
$themes[$theme_name] = theme::get_info($theme_name);
}
}
return $themes;
}
Expand Down
4 changes: 2 additions & 2 deletions modules/gallery/helpers/gallery_event.php
Expand Up @@ -228,8 +228,8 @@ static function admin_menu($menu, $theme) {
->label(t("Advanced"))
->url(url::site("admin/advanced_settings")))
->append(Menu::factory("link")
->id("identity_drivers")
->label(t("Identity drivers"))
->id("authentication")
->label(t("Authentication"))
->url(url::site("admin/identity"))))
->append(Menu::factory("link")
->id("modules")
Expand Down
2 changes: 1 addition & 1 deletion modules/gallery/libraries/Theme_View.php
Expand Up @@ -172,7 +172,7 @@ public function paginator() {

$v->first_visible_position = ($this->page - 1) * $this->page_size + 1;
$v->last_visible_position = min($this->page * $this->page_size, $v->total);
} else {
} else if ($this->page_type == "item") {
$v->position = $this->position;
$v->total = $this->sibling_count;
if ($this->previous_item) {
Expand Down
2 changes: 1 addition & 1 deletion modules/search/controllers/search.php
Expand Up @@ -33,7 +33,7 @@ public function index() {

$max_pages = max(ceil($count / $page_size), 1);

$template = new Theme_View("page.html", "other", "search");
$template = new Theme_View("page.html", "collection", "search");
$template->set_global("page", $page);
$template->set_global("max_pages", $max_pages);
$template->set_global("page_size", $page_size);
Expand Down

0 comments on commit 7599894

Please sign in to comment.