Index: fivestar.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/fivestar/fivestar.module,v
retrieving revision 1.13.2.42
diff -u -p -r1.13.2.42 fivestar.module
--- fivestar.module	26 Sep 2008 08:13:00 -0000	1.13.2.42
+++ fivestar.module	30 Sep 2008 10:05:54 -0000
@@ -481,14 +481,14 @@ function fivestar_settings() {
 
   $form['submit'] = array(
     '#type' => 'submit',
-    '#value' => t('Submit'),
+    '#value' => t('Save configuration'),
     '#weight' => 45,
   );
 
   return $form;
 }
 
-function fivestar_settings_submit($form, $form_state) {
+function fivestar_settings_submit($form, &$form_state) {
   variable_set('fivestar_widget', $form_state['values']['fivestar_widget']);
 }
 
@@ -929,8 +929,7 @@ function fivestar_block($op = 'list', $d
 
     case 'view':
       if (user_access('access content') && user_access('rate content')) {
-        if (arg(0) == 'node' && is_numeric(arg(1)) && (arg(2) == '' || arg(2) == 'view')) {
-          $node = node_load(arg(1));
+        if ($node = menu_get_object() && (arg(2) == '' || arg(2) == 'view')) {
           if (_fivestar_validate_target('node', $node->nid)) {
             $block['subject'] = t('Rate This');
             $block['content'] = fivestar_widget_form($node);