Changeset 8232 for branches/2.5/preferences

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

Location:

branches/2.5/preferences

Files:

• changepassword.php (modified) (1 diff)
• setup/setup.inc.php (modified) (2 diffs)

branches/2.5/preferences/changepassword.php

@@ -108 +108 @@
         $GLOBALS['phpgw']->template->set_var('lang_change',lang('Change'));
         $GLOBALS['phpgw']->template->set_var('lang_cancel',lang('Cancel'));
+        $GLOBALS['phpgw']->template->set_var('cancel_action' , $GLOBALS['phpgw']->link('/preferences/')); 
         $GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/preferences/changepassword.php'));
 

branches/2.5/preferences/setup/setup.inc.php

@@ -13 +13 @@
         $setup_info['preferences']['name']      = 'preferences';
         $setup_info['preferences']['title']     = 'Preferences';
-        $setup_info['preferences']['version']   = '2.5.0';
+        $setup_info['preferences']['version']   = '2.5.1';
         $setup_info['preferences']['app_order'] = 1;
         $setup_info['preferences']['tables']    = '';
@@ -28 +28 @@
         $setup_info['preferences']['depends'][] = array(
                 'appname' => 'phpgwapi',
-                'versions' => Array('2.5.0')
+                'versions' => Array('2.5.1.1')
         );
 ?>