automatically remove and prevent installation of apps with a require version less...

Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5

diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index e58f83c5a01260969ca8a72c3c8e2c891215c2b2..0a1b196b06f3cf40e389facb455a79f856d015ce 100644 (file)
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -5,7 +5,7 @@
        <description>File Management</description>
        <licence>AGPL</licence>
        <author>Robin Appelman</author>
-       <require>4</require>
+       <require>4.9</require>
        <shipped>true</shipped>
        <standalone/>
        <default_enable/>

diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 419bdb1b120903f9371cec3c94d512c8c29e1f9e..48a28fde78a9c42a8862834cb948fb5e52df11ae 100644 (file)
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -5,7 +5,7 @@
        <description>Server side encryption of files. DEPRECATED. This app is no longer supported and will be replaced with an improved version in ownCloud 5. Only enable this features if you want to read old encrypted data. Warning: You will lose your data if you enable this App and forget your password. Encryption is not yet compatible with LDAP.</description>
        <licence>AGPL</licence>
        <author>Robin Appelman</author>
-       <require>4</require>
+       <require>4.9</require>
        <shipped>true</shipped>
        <types>
                <filesystem/>

diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index e0301365d16fb051b0d71681ab4f4d321b196ec1..3da1913c5fcef94eff161e583f33bd4ddd983f27 100644 (file)
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -5,7 +5,7 @@
        <description>Mount external storage sources</description>
        <licence>AGPL</licence>
        <author>Robin Appelman, Michael Gapczynski</author>
-       <require>4</require>
+       <require>4.9</require>
        <shipped>true</shipped>
        <types>
                <filesystem/>

diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 6a8fc89adae9f36664d41c4b6d1ae312cfa1271b..a44d0338bb611de3f6a94ed4cf9ebda24017583d 100644 (file)
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -5,7 +5,7 @@
        <description>File sharing between users</description>
        <licence>AGPL</licence>
        <author>Michael Gapczynski</author>
-       <require>4</require>
+       <require>4.9</require>
        <shipped>true</shipped>
        <default_enable/>
        <types>

diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index d806291ed1d5ab78b833d40012f43a8e776fe302..e4e5a365d51a05897898ba9c22e34fe0e9272bd8 100644 (file)
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -4,7 +4,7 @@
        <name>Versions</name>
        <licence>AGPL</licence>
        <author>Frank Karlitschek</author>
-       <require>4</require>
+       <require>4.9</require>
        <shipped>true</shipped>
        <description>Versioning of files</description>
        <types>

diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index de0daf146e34e3df852179b6f0d8197df7ddb82a..30fbf687dbedbbb76925caee3b3ec90da2a1c4c8 100644 (file)
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -5,7 +5,7 @@
        <description>Authenticate Users by LDAP</description>
        <licence>AGPL</licence>
        <author>Dominik Schmidt and Arthur Schiwon</author>
-       <require>4</require>
+       <require>4.9</require>
        <shipped>true</shipped>
        <types>
                <authentication/>

diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
index dc555739f46914ec018b059b846c6b8d8b0ef76f..9a8027daee68748ce35375775b9cfa81d1c53691 100755 (executable)
--- a/apps/user_webdavauth/appinfo/info.xml
+++ b/apps/user_webdavauth/appinfo/info.xml
@@ -6,6 +6,6 @@
        <version>1.0</version>
        <licence>AGPL</licence>
        <author>Frank Karlitschek</author>
-       <require>3</require>
+       <require>4.9</require>
        <shipped>true</shipped>
 </info>

diff --git a/lib/app.php b/lib/app.php
index 7889339e4203651c0cd03a59f845b74ee6577492..90b5c58a448a0cf8496b5b67c813331556671285 100755 (executable)
--- a/lib/app.php
+++ b/lib/app.php
@@ -664,8 +664,8 @@ class OC_App{
                $version = OC_Util::getVersion();
                foreach($apps as $app) {
                        // check if the app is compatible with this version of ownCloud
-                       $info = OC_App::getAppInfo($app);
-                       if(!isset($info['require']) or ($version[0]>$info['require'])) {
+                       $info = OC_App::getAppInfo($app);                       
+                       if(!isset($info['require']) or (($version[0].'.'.$version[1])>$info['require'])) {
                                OC_Log::write('core', 'App "'.$info['name'].'" ('.$app.') can\'t be used because it is not compatible with this version of ownCloud', OC_Log::ERROR);
                                OC_App::disable( $app );
                        }

diff --git a/lib/util.php b/lib/util.php
index db715a7a0f3b4a945c487884af6884478563e615..255faf8df76467f83758bb77959ec0e970af6c9d 100755 (executable)
--- a/lib/util.php
+++ b/lib/util.php
@@ -80,8 +80,8 @@ class OC_Util {
         * @return array
         */
        public static function getVersion() {
-               // hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user
-               return array(4,85,11);
+               // hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4.9.0. This is not visible to the user
+               return array(4,86,11);
        }
 
        /**