Changeset 2366 for trunk/phpgwapi
- Timestamp:
- 03/29/10 12:49:53 (14 years ago)
- Location:
- trunk/phpgwapi/inc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/phpgwapi/inc/class.common.inc.php
r2315 r2366 1223 1223 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript'); 1224 1224 } 1225 1226 $GLOBALS['phpgw']->js->validate_file( 'tools','event_config' ); 1227 $GLOBALS['phpgw']->js->validate_file( 'tools','xconnector' ); 1228 //$GLOBALS['phpgw']->js->validate_file( 'tools','xlink' ); 1229 1225 1230 $GLOBALS['phpgw']->js->validate_file('expressoAjax','expressoAjax'); 1231 1226 1232 echo "<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>"; 1227 1233 echo $GLOBALS['phpgw']->js->get_script_links(); 1234 1228 1235 $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','expressoAjax'); 1229 1236 -
trunk/phpgwapi/inc/functions.inc.php
r2205 r2366 421 421 { 422 422 $GLOBALS['phpgw']->common->phpgw_header(); 423 if ($GLOBALS['phpgw_info']['flags']['noheader'])424 {425 echo parse_navbar();426 }427 423 428 424 $GLOBALS['phpgw']->log->write(array('text'=>'W-Permissions, Attempted to access %1','p1'=>$GLOBALS['phpgw_info']['flags']['currentapp']));
Note: See TracChangeset
for help on using the changeset viewer.