diff --git a/e107_files/shortcode/batch/admin_shortcodes_class.php b/e107_files/shortcode/batch/admin_shortcodes_class.php
index 5cf33629d..adc6e3214 100644
--- a/e107_files/shortcode/batch/admin_shortcodes_class.php
+++ b/e107_files/shortcode/batch/admin_shortcodes_class.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-* $Id: admin_shortcodes_class.php,v 1.22 2009-09-17 14:25:09 e107coders Exp $
+* $Id: admin_shortcodes_class.php,v 1.23 2009-09-21 21:56:02 e107coders Exp $
 *
 * Admin shortcode batch - class
 */
@@ -1290,11 +1290,14 @@ class admin_shortcodes
         $var['menumanager']['text'] = LAN_MENULAYOUT;
 		$var['menumanager']['link'] = e_ADMIN_ABS."menus.php";
 
-        foreach($pref['menuconfig_list'] as $name=>$val)
+		if(vartrue($pref['menuconfig_list']))
 		{
-           	$var[$name]['text'] = str_replace(":"," / ",$val['name']);
- 			$var[$name]['link'] = e_PLUGIN_ABS.$val['link'];
-
+	        foreach($pref['menuconfig_list'] as $name=>$val)
+			{
+	           	$var[$name]['text'] = str_replace(":"," / ",$val['name']);
+	 			$var[$name]['link'] = e_PLUGIN_ABS.$val['link'];
+	
+			}
 		}
 
  		foreach($var as $key=>$link)
diff --git a/e107_plugins/download/handlers/adminDownload_class.php b/e107_plugins/download/handlers/adminDownload_class.php
index 77d5abb39..f76506700 100644
--- a/e107_plugins/download/handlers/adminDownload_class.php
+++ b/e107_plugins/download/handlers/adminDownload_class.php
@@ -10,8 +10,8 @@
  |     GNU General Public License (http://gnu.org).
  |
  |     $Source: /cvs_backup/e107_0.8/e107_plugins/download/handlers/adminDownload_class.php,v $
- |     $Revision: 1.20 $
- |     $Date: 2009-09-18 19:07:09 $
+ |     $Revision: 1.21 $
+ |     $Date: 2009-09-21 21:56:09 $
  |     $Author: e107coders $
  +----------------------------------------------------------------------------+
 */
@@ -537,7 +537,7 @@ class adminDownload extends download
              $file_array[] = str_replace(e_FILE."public/","",$val);
          }
       }
-      if ($sql->db_Select("rbinary"))
+/*      if ($sql->db_Select("rbinary")) //TODO Remove me. 
       {
          while ($row = $sql->db_Fetch())
          {
@@ -545,6 +545,7 @@ class adminDownload extends download
             $file_array[] = "Binary ".$binary_id."/".$binary_name;
          }
       }
+*/
       if ($image_array = $fl->get_files(e_FILE.'downloadimages/', '\.gif$|\.jpg$|\.png$|\.GIF$|\.JPG$|\.PNG$','standard',2))
       {
          sort($image_array);