- Merge devel-framework branch, resolved conflicts

alecpl

2012-04-13 0c259682f65eaaf23ea4ccb56a706d6baf3007e4

 program/steps/addressbook/func.inc

@@ -203,7 +203,7 @@
            'rel' => '%s',
            'onclick' => "return ".JS_OBJECT_NAME.".command('list','%s',this)"), '%s'));

    $sources = (array) $OUTPUT->env['address_sources'];
    $sources = (array) $OUTPUT->get_env('address_sources');
    reset($sources);

    // currently selected source
@@ -669,7 +669,7 @@
                }
            }

            if (!$content && !$edit_mode)
            if (!$content && (!$edit_mode || !$select_add->_count))
                continue;

            // also render add-field selector