diff --git a/CHANGES b/CHANGES index 8ab4fce10b8a14ec08dc86189f30f41e48885747..231d1b606674624a42350696116f213d25264b90 100644 --- a/CHANGES +++ b/CHANGES @@ -134,10 +134,6 @@ pbx_lua stopped and restarted using the autoservice_stop() and autoservice_start() functions. -PrivacyManager --------------------------- - * Removed unused options position since there are no more options defined. - ------------------------------------------------------------------------------ --- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ---------------- ------------------------------------------------------------------------------ diff --git a/UPGRADE.txt b/UPGRADE.txt index ef3a1fbd3dc620beba9b945945a7169d7b3b7096..3525621d3940160b234b96a172ff99807f179d04 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -50,8 +50,5 @@ pbx_lua: - the autoservice now defaults to being on by default - autoservice_start() and autoservice_start() no longer return a value. -PrivacyManager: - - Removed unused options position since there are no more options defined. - =========================================================== =========================================================== diff --git a/apps/app_privacy.c b/apps/app_privacy.c index e52f024752a4049f9bd55a1ee28f8a54cae99b93..6a6c1a437812fa46da4dddaf3803a190a268059c 100644 --- a/apps/app_privacy.c +++ b/apps/app_privacy.c @@ -53,6 +53,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <parameter name="minlength"> <para>Minimum allowable digits in the input callerid number. Defaults to <literal>10</literal>.</para> </parameter> + <parameter name="options"> + <para>Position reserved for options.</para> + </parameter> <parameter name="context"> <para>Context to check the given callerid against patterns.</para> </parameter> @@ -92,10 +95,8 @@ static int privacy_exec(struct ast_channel *chan, const char *data) AST_DECLARE_APP_ARGS(args, AST_APP_ARG(maxretries); AST_APP_ARG(minlength); - AST_APP_ARG(checkcontext); - - /* This must be last in the list until we actually have some options again. :) */ AST_APP_ARG(options); + AST_APP_ARG(checkcontext); ); if (chan->caller.id.number.valid