From: x2000habouzit <x2000habouzit>
Date: Wed, 24 Nov 2004 14:21:48 +0000 (+0000)
Subject: oh yeah I can now remove this ******
X-Git-Tag: xorg/old~794
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d4fae5dd9bdc33ac17b59de64306537acde1f754;p=platal.git

oh yeah I can now remove this ******
---

diff --git a/include/xorg.globals.inc.php.in b/include/xorg.globals.inc.php.in
index 6e305c7..944a0bb 100644
--- a/include/xorg.globals.inc.php.in
+++ b/include/xorg.globals.inc.php.in
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-    $Id: xorg.globals.inc.php.in,v 1.7 2004-11-23 20:56:42 x2000habouzit Exp $
+    $Id: xorg.globals.inc.php.in,v 1.8 2004-11-24 14:21:48 x2000habouzit Exp $
  ***************************************************************************/
 
 require_once("diogenes.core.globals.inc.php");
@@ -75,10 +75,7 @@ class XorgGlobals extends DiogenesCoreGlobals
         foreach ($array as $cat=>$conf) {
             $c = strtolower($cat);
             foreach ($conf as $key=>$val) {
-                if ($c == 'global') {
-                    global $$key;
-                    $$key = $val;
-                } elseif ($c == 'core' && isset($this->$key)) {
+                if ($c == 'core' && isset($this->$key)) {
                     $this->$key=$val;
                 } else {
                     $this->$c->$key = $val;