extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 19:39:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent new categories from being created during dry-run

Browse Source
This commit is contained in:
Nathan Gray 2012-10-22 14:25:43 +00:00
parent 122230b88e
commit caae2ceeae
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
importexport/inc/class.importexport_helper_functions.inc.php
View File

@ -21,6 +21,11 @@ class importexport_helper_functions {
*/
const CACHE_EXPIRATION = 3600;
/**
* Make no changes (automatic category creation)
*/
public static $dry_run = false;
/**
* Files known to cause problems, and will be skipped in a plugin scan
* If you put appname => true, the whole app will be skipped.
@ -187,12 +192,7 @@ class importexport_helper_functions {
foreach ( $cat_names as $cat_name ) {
$cat_name = trim($cat_name);
if ( $cat_name == '' ) continue;
// Handle any IDs that slip in
if ( is_numeric($cat_name) && categories::id2name((int)$cat_name)) {
$cat_ids[] = (int)$cat_name;
continue;
}
if ( ( $cat_id = $cats->name2id( $cat_name ) ) == 0 ) {
if ( ( $cat_id = $cats->name2id( $cat_name ) ) == 0 && !self::$dry_run) {
$cat_id = $cats->add( array(
'name' => $cat_name,
'parent' => $parent,