Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -r313 -r332
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 313)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 332)
@@ -243,7 +243,7 @@
               {            
                 if($this->IsNewItem())
                 {
-                  $ret = $element->attributes["_label"];
+                  $ret = $element->GetAttributeByName('_label');
                   if(!strlen($ret))
                     $ret = "lu_new";
                   $ret = language($ret);
@@ -283,7 +283,7 @@
             case "pick":
                 if($this->Get("EditorsPick")==1)
                 {
-                  $ret = $element->attributes["_label"];
+                  $ret = $element->GetAttributeByName('_label');
                   if(!strlen($ret))
                     $ret = "lu_pick";
                   $ret = language($ret);
@@ -1679,68 +1679,62 @@
     
     function GetAdminPageLinkList($url)
     {
-        global $objConfig, $var_list_update, $var_list;
+        global $objConfig;
           
-        $v = $this->PageEnvar;
-        global ${$v}; 
+        $update =& $GLOBALS[$this->PageEnvar]; // env_var_update
                 
-        if(strlen($this->PerPageVar)==0)
-            $this->PerPageVar = "Perpage_Links";
+        // insteresting stuff :)
+        if(!$this->PerPageVar) $this->PerPageVar = "Perpage_Links";
 
         $PerPage = $objConfig->Get($this->PerPageVar);
-        if($PerPage<1)
-            $PerPage=20;
+        if($PerPage < 1) $PerPage = 20;
           
         $NumPages = ceil($this->GetNumPages($PerPage));
         
         //echo $this->CurrentPage." of ".$NumPages." Pages";
 
-        $o = "";
-        if($this->Page>$NumPages)
-            $this->Page=$NumPages;
+        if($this->Page > $NumPages) $this->Page = $NumPages;
 
         $StartPage = $this->Page - 5;
-        if($StartPage<1)
-            $StartPage=1;
-        $EndPage = $StartPage+9;
-        if($EndPage>$NumPages)
+        if($StartPage < 1) $StartPage = 1;
+        $EndPage = $StartPage + 9;
+        if($EndPage > $NumPages)
         {        
             $EndPage = $NumPages;
             $StartPage = $EndPage-9;
-            if($StartPage<1)
-                $StartPage=1;
+            if($StartPage < 1) $StartPage = 1;
         }
 
-        $o = "";
+        $o = '';
 
-        if($StartPage>1)
+        if($StartPage > 1)
         {
-           ${$v}[$this->PageEnvarIndex]= $this->Page-10;
-           $prev_url = $url."?env=".BuildEnv();
-           $o .= "<A HREF=\"$prev_url\">&lt;&lt;</A>";
+           $update[$this->PageEnvarIndex]= $this->Page - 10;
+           $prev_url = $url.'?env='.BuildEnv();
+           $o .= '<a href="'.$prev_url.'">&lt;&lt;</a>';
         }
 
         
-        for($p=$StartPage;$p<=$EndPage;$p++)
+        for($p = $StartPage; $p <= $EndPage; $p++)
         {
-            if($p!=$this->Page)
+            if($p != $this->Page)
             {
-                ${$v}[$this->PageEnvarIndex]=$p;
-                $href = $url."?env=".BuildEnv();
-                $o .= " <A HREF=\"$href\" class=\"NAV_URL\">$p</A> ";
+                $update[$this->PageEnvarIndex] = $p;
+                $href = $url.'?env='.BuildEnv();
+                $o .= ' <a href="'.$href.'" class="NAV_URL">'.$p.'</a> ';
             }
             else
             {
-                $o .= "<SPAN class=\"CURRENT_PAGE\">$p</SPAN>";
+                $o .= '<SPAN class="CURRENT_PAGE">'.$p.'</SPAN>';
             }
         }
-        if($EndPage<$NumPages)
+        if($EndPage < $NumPages)
         {
-          ${$v}[$this->PageEnvarIndex]=$this->Page+10;
-          $next_url = $url."?env=".BuildEnv();
-          $o .= "<A HREF=\"$next_url\"> &gt;&gt;</A>";
+          $update[$this->PageEnvarIndex] = $this->Page + 10;
+          $next_url = $url.'?env='.BuildEnv();
+          $o .= '<a href="'.$next_url.'"> &gt;&gt;</a>';
         }
-        unset( ${$v}[$this->PageEnvarIndex]);
+        unset( $update[$this->PageEnvarIndex] );
         return $o;        
     }       
 }