Permalink
Browse files

Merge branch 'master' into 3.0.x

  • Loading branch information...
2 parents eafa8bb + 9f3c6e4 commit 9620ed7acd5366fe27bb9809a83def607bf4eae2 @bharat bharat committed Dec 29, 2010
Showing with 15 additions and 13 deletions.
  1. +2 −2 modules/gallery/tests/Item_Model_Test.php
  2. +13 −11 modules/gallery/tests/xss_data.txt
@@ -362,11 +362,11 @@ public function as_restful_array_test() {
}
public function as_restful_array_with_edit_bit_test() {
- $response = item::root()->as_restful_array(true);
+ $response = item::root()->as_restful_array();
$this->assert_true($response["can_edit"]);
identity::set_active_user(identity::guest());
- $response = item::root()->as_restful_array(true);
+ $response = item::root()->as_restful_array();
$this->assert_false($response["can_edit"]);
}
@@ -399,17 +399,19 @@ themes/wind/views/dynamic.html.php 29 DIRTY $theme
themes/wind/views/movie.html.php 5 DIRTY $theme->paginator()
themes/wind/views/movie.html.php 9 DIRTY $item->movie_img(array("class"=>"g-movie","id"=>"g-item-id-{$item->id}"))
themes/wind/views/page.html.php 9 DIRTY $page_title
-themes/wind/views/page.html.php 32 DIRTY_JS $theme->url()
-themes/wind/views/page.html.php 41 DIRTY $new_width
-themes/wind/views/page.html.php 42 DIRTY $new_height
-themes/wind/views/page.html.php 43 DIRTY $thumb_proportion
-themes/wind/views/page.html.php 80 DIRTY $header_text
-themes/wind/views/page.html.php 82 DIRTY_JS item::root()->url()
-themes/wind/views/page.html.php 86 DIRTY $theme->user_menu()
-themes/wind/views/page.html.php 107 DIRTY_JS $parent->url($parent->id==$theme->item()->parent_id?"show={$theme->item()->id}":null)
-themes/wind/views/page.html.php 128 DIRTY $content
-themes/wind/views/page.html.php 134 DIRTY newView("sidebar.html")
-themes/wind/views/page.html.php 141 DIRTY $footer_text
+themes/wind/views/page.html.php 12 DIRTY $theme->item()->title
+themes/wind/views/page.html.php 16 DIRTY item::root()->title
+themes/wind/views/page.html.php 26 DIRTY_JS $theme->url()
+themes/wind/views/page.html.php 35 DIRTY $new_width
+themes/wind/views/page.html.php 36 DIRTY $new_height
+themes/wind/views/page.html.php 37 DIRTY $thumb_proportion
+themes/wind/views/page.html.php 74 DIRTY $header_text
+themes/wind/views/page.html.php 76 DIRTY_JS item::root()->url()
+themes/wind/views/page.html.php 80 DIRTY $theme->user_menu()
+themes/wind/views/page.html.php 101 DIRTY_JS $parent->url($parent->id==$theme->item()->parent_id?"show={$theme->item()->id}":null)
+themes/wind/views/page.html.php 122 DIRTY $content
+themes/wind/views/page.html.php 128 DIRTY newView("sidebar.html")
+themes/wind/views/page.html.php 135 DIRTY $footer_text
themes/wind/views/paginator.html.php 33 DIRTY_JS $first_page_url
themes/wind/views/paginator.html.php 42 DIRTY_JS $previous_page_url
themes/wind/views/paginator.html.php 70 DIRTY_JS $next_page_url

0 comments on commit 9620ed7

Please sign in to comment.