Commit e859baf0 authored by Robert Lyon's avatar Robert Lyon Committed by Son Nguyen
Browse files

Bug 1591304: Undefined $view in is_themeable() 



Should be $this rather than $view as we are within a view object

Change-Id: I3132d6d380a82c3cd4cbc6fc35a4ab5fb19af673
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 8203904b)
parent 9c6d21c1

htdocs/lib/view.php

+1 −1
Original line number Diff line number Diff line
@@ -5996,7 +5996,7 @@ class View { 
     */

    function is_themeable() {

        $unthemable_types = array('grouphomepage', 'dashboard');

        return !$view->get('template') && !in_array($this->type, $unthemable_types);

        return !$this->get('template') && !in_array($this->type, $unthemable_types);

    }



    /**

test/behat/features/view/user_themes.feature

0 → 100644
+22 −0
Original line number Diff line number Diff line 
@javascript @core @core_view

Feature: Allow user themes on pages

In order to allow a user theme on a page

As an admin

I need to be able to activate Users can choose page themes setting



Scenario: Activate page themes setting and edit a page (Bug 1591304)

 Given I log in as "admin" with password "Kupuhipa1"

 And I follow "Administration"

 # I set the page themes option

 And I follow "Configure site"

 And I expand the section "User settings"

 And I enable the switch "Users can choose page themes"

 And I press "Update site options"

 # Now edit a page

 And I follow "Return to site"

 And I follow "Portfolio"

 And I press "Create page"

 And I press "Save"

 And I follow "Text"

 And I press "Add"

 And I press "Save"
 
 No newline at end of file