Changeset 2608 for trunk/phpgwapi

Timestamp:

04/20/10 16:39:19 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Garantindo que a variável URL_SERVER esteja populada.

Location:

trunk/phpgwapi/inc

Files:

• class.common.inc.php (modified) (1 diff)
• class.javascript.inc.php (modified) (1 diff)

trunk/phpgwapi/inc/class.common.inc.php

@@ -388 +388 @@
                                         $GLOBALS['phpgw_info']['flags']['java_script_thirst'] .= '<script type="text/javascript">var URL_SERVER = "'
                                                 . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] . '";'
-                                                . 'var template = "' . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ] . '";</script>';
+                                                . 'var template = "' . ( ( ! empty( $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ] ) ) ? $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ] : '/' )
+                                                . '";</script>';
 
                                         $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'wz_dragdrop', 'wz_dragdrop', NULL, true );

trunk/phpgwapi/inc/class.javascript.inc.php

@@ -3 +3 @@
   * eGroupWare API - JavaScript                                              *
   * Written by Dave Hall skwashd at phpgroupware.org                         *
-  * Copyright (C) 2003 Free Software Foundation Inc                          *          
+  * Copyright (C) 2003 Free Software Foundation Inc                          *
   * -------------------------------------------------------------------------*
   * This library is part of the eGroupWare API                               *
-  * http://www.egroupware.org/api                                            * 
+  * http://www.egroupware.org/api                                            *
   * ------------------------------------------------------------------------ *
   *  This program is Free Software; you can redistribute it and/or modify it *