Automatically detect the edition based on the enterprise_key app.

lib/private/util.php

@@ -285,8 +285,12 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getEditionString() {
-		OC_Util::loadVersion();
-		return \OC::$server->getSession()->get('OC_Edition');
+		if (OC_App::isEnabled('enterprise_key')) {
+			return "Enterprise";
+		} else {
+			return "";
+		}
+
 	}
 
 	/**

version.php

@@ -8,9 +8,6 @@ $OC_Version=array(7, 8, 1, 0);
 // The human readable string
 $OC_VersionString='8.0 pre alpha';
 
-// The ownCloud edition
-$OC_Edition='';
-
 // The ownCloud channel
 $OC_Channel='git';