mirror of
https://github.com/e107inc/e107.git
synced 2025-01-16 20:28:28 +01:00
Check for and ignore plugin.php in scan if plugin.xml is there
This commit is contained in:
parent
d968b4f315
commit
1eb6f7386c
@ -11,9 +11,9 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $
|
||||
| $Revision: 1.50 $
|
||||
| $Date: 2008-11-24 00:36:50 $
|
||||
| $Author: mcfly_e107 $
|
||||
| $Revision: 1.51 $
|
||||
| $Date: 2008-12-02 21:51:22 $
|
||||
| $Author: e107steved $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
@ -136,6 +136,27 @@ class e107plugin
|
||||
}
|
||||
}
|
||||
|
||||
$i = 1;
|
||||
while ( $i < count($pluginList))
|
||||
{
|
||||
if ($pluginList[$i-1]['path'] == $pluginList[$i]['path'])
|
||||
{ // Must have plugin.php and plugin.xml
|
||||
if (($pluginList[$i-1]['fname'] == 'plugin.php') && ($pluginList[$i]['fname'] == 'plugin.xml'))
|
||||
{
|
||||
// echo "deleting: {$pluginList[$i-1]['path']}<br />";
|
||||
unset($pluginList[$i-1]);
|
||||
$i++;
|
||||
}
|
||||
if (($pluginList[$i]['fname'] == 'plugin.php') && ($pluginList[$i-1]['fname'] == 'plugin.xml'))
|
||||
{
|
||||
// echo "deleting: {$pluginList[$i]['path']}<br />";
|
||||
unset($pluginList[$i]);
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
|
||||
foreach($pluginList as $p)
|
||||
{
|
||||
$plug['plug_action'] = 'scan'; // Make sure plugin.php knows what we're up to
|
||||
|
Loading…
x
Reference in New Issue
Block a user