Changeset 7228 for branches/2.4/phpgwapi
- Timestamp:
- 09/17/12 14:30:47 (12 years ago)
- Location:
- branches/2.4
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4
- Property svn:mergeinfo changed
-
branches/2.4/phpgwapi/inc/class.applications.inc.php
r6853 r7228 278 278 if (empty($GLOBALS['phpgw_info']['apps'])) 279 279 { 280 $this->db->query('select * from phpgw_applications where app_enabled != 3 and app_name!= \'rest\' order by app_order asc',__LINE__,__FILE__); 280 $this->db->query('select * from phpgw_applications where app_enabled != 3 and app_name!= \'rest\' order by app_order asc',__LINE__,__FILE__); 281 281 if($this->db->num_rows()) 282 282 { -
branches/2.4/phpgwapi/inc/class.sessions_php4.inc.php
r7215 r7228 213 213 fclose ($fd); 214 214 } 215 $session = unserialize(substr($session,(strpos($session, 'phpgw_session|') + 14))); 216 if(is_array($session) && isset($session['session_id']))217 $values[$session['session_id']] = $session; 215 $session = unserialize(substr($session,(strpos($session, 'phpgw_session|') + 14))); 216 if(is_array($session) && isset($session['session_id'])) 217 $values[$session['session_id']] = $session; 218 218 } 219 219 closedir($dir); -
branches/2.4/phpgwapi/setup/setup.inc.php
r6754 r7228 14 14 $setup_info['phpgwapi']['name'] = 'phpgwapi'; 15 15 $setup_info['phpgwapi']['title'] = 'API'; 16 $setup_info['phpgwapi']['version'] = '2.4. 1';17 $setup_info['phpgwapi']['versions']['current_header'] = '2.4. 1';16 $setup_info['phpgwapi']['version'] = '2.4.2'; 17 $setup_info['phpgwapi']['versions']['current_header'] = '2.4.2'; 18 18 $setup_info['phpgwapi']['enable'] = 3; 19 19 $setup_info['phpgwapi']['app_order'] = 1; -
branches/2.4/phpgwapi/setup/tables_update.inc.php
r6754 r7228 169 169 return $GLOBALS['setup_info']['phpgwapi']['currentver']; 170 170 } 171 172 $test[] = '2.4.1'; 173 function phpgwapi_upgrade2_4_1() 174 { 175 $GLOBALS['setup_info']['phpgwapi']['currentver'] = '2.4.2'; 176 return $GLOBALS['setup_info']['phpgwapi']['currentver']; 177 } 171 178 ?> -
branches/2.4/phpgwapi/templates/default/login_default.php
r6754 r7228 465 465 466 466 if(lang('loginhelp_message') != 'loginhelp_message*' && trim(lang('loginhelp_message')) != ""){ 467 $tmpl->set_var('lang_help',lang("Help")); 467 $tmpl->set_var('lang_help',lang("Help")); 468 $tmpl->set_var('lang','pt-br'); 468 469 } 469 470 else
Note: See TracChangeset
for help on using the changeset viewer.