In a weak acid solution, although it is weak, the acid gives up some H⁺. A strong base will dissociate almost completely when add and its OH⁻ will neutralize the H⁺ in solution, converting into water.
Depending on the concentrations of both, after the addition the weak acid can still give up H⁺.
This means that both 1 and 2 are happening in the solution, so the answer is both.