diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-30 19:25:43 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-30 19:25:43 -0700 |
| commit | 7aa03e59bad72d549c348a597c0d9b6fd63e0fa6 (patch) | |
| tree | 2e682e5c37b65d3719e55a3cb8710ec73aee25d1 | |
| parent | d3ce7f7e36bac0e03db7028eb915ab066124a669 (diff) | |
| parent | 19d89f94f9939bbd879d6c8ead4e802f592ec808 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
| -rw-r--r-- | modules/gallery/helpers/gallery_theme.php | 2 | ||||
| -rw-r--r-- | modules/gallery/tests/Item_Model_Test.php | 6 | ||||
| -rw-r--r-- | modules/gallery/tests/xss_data.txt | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php index 81b22b74..d3751b80 100644 --- a/modules/gallery/helpers/gallery_theme.php +++ b/modules/gallery/helpers/gallery_theme.php @@ -128,7 +128,7 @@ class gallery_theme_Core { return gallery_theme::credits(); } - public function body_attributes() { + static function body_attributes() { if (locales::is_rtl()) { return 'class="rtl"'; } diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php index a21cdc13..c2773097 100644 --- a/modules/gallery/tests/Item_Model_Test.php +++ b/modules/gallery/tests/Item_Model_Test.php @@ -142,17 +142,11 @@ class Item_Model_Test extends Unit_Test_Case { } public function save_original_values_test() { - print "START\n"; $item = $this->create_random_item(); $item->title = "ORIGINAL_VALUE"; $item->save(); - - print "CHANGE\n"; $item->title = "NEW_VALUE"; - //printf("<pre>%s</pre>",print_r($item,1));flush(); - - print "COMPARE\n"; $this->assert_same("ORIGINAL_VALUE", $item->original("title")); $this->assert_same("NEW_VALUE", $item->title); } diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt index 5335a812..29d223b7 100644 --- a/modules/gallery/tests/xss_data.txt +++ b/modules/gallery/tests/xss_data.txt @@ -163,9 +163,9 @@ modules/gallery/views/admin_maintenance_show_log.html.php 8 DIRTY $task->id modules/gallery/views/admin_maintenance_show_log.html.php 8 DIRTY $csrf modules/gallery/views/admin_maintenance_show_log.html.php 13 DIRTY $task->name modules/gallery/views/admin_maintenance_show_log.html.php 15 $task->get_log() -modules/gallery/views/admin_maintenance_task.html.php 23 DIRTY $task->id -modules/gallery/views/admin_maintenance_task.html.php 23 DIRTY $csrf -modules/gallery/views/admin_maintenance_task.html.php 47 DIRTY $task->name +modules/gallery/views/admin_maintenance_task.html.php 30 DIRTY $task->id +modules/gallery/views/admin_maintenance_task.html.php 30 DIRTY $csrf +modules/gallery/views/admin_maintenance_task.html.php 54 DIRTY $task->name modules/gallery/views/admin_modules.html.php 19 DIRTY $i modules/gallery/views/admin_modules.html.php 22 DIRTY $data modules/gallery/views/admin_modules.html.php 22 DIRTY $module_name |